Skip to content

Commit

Permalink
Merge pull request #29 from neos-love/develop
Browse files Browse the repository at this point in the history
13.14.1-neos-love.0
  • Loading branch information
rassi0429 authored Jul 21, 2023
2 parents c3bc57d + 969caa9 commit 7ffb49d
Show file tree
Hide file tree
Showing 963 changed files with 30,815 additions and 20,545 deletions.
11 changes: 11 additions & 0 deletions .config/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ url: https://example.tld/
# The port that your Misskey server should listen on.
port: 3000

# You can also use UNIX domain socket.
# socket: /path/to/misskey.sock
# chmodSocket: '777'

# ┌──────────────────────────┐
#───┘ PostgreSQL configuration └────────────────────────────────

Expand Down Expand Up @@ -78,6 +82,8 @@ redis:
#pass: example-pass
#prefix: example-prefix
#db: 1
# You can specify more ioredis options...
#username: example-username

#redisForPubsub:
# host: localhost
Expand All @@ -86,6 +92,8 @@ redis:
# #pass: example-pass
# #prefix: example-prefix
# #db: 1
# # You can specify more ioredis options...
# #username: example-username

#redisForJobQueue:
# host: localhost
Expand All @@ -94,6 +102,8 @@ redis:
# #pass: example-pass
# #prefix: example-prefix
# #db: 1
# # You can specify more ioredis options...
# #username: example-username

# ┌───────────────────────────┐
#───┘ MeiliSearch configuration └─────────────────────────────
Expand All @@ -104,6 +114,7 @@ redis:
# apiKey: ''
# ssl: true
# index: ''
# scope: local

# ┌───────────────┐
#───┘ ID generation └───────────────────────────────────────────
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"features": {
"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
"ghcr.io/devcontainers/features/node:1": {
"version": "18.16.0"
"version": "20.3.1"
}
},
"forwardPorts": [3000],
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.8'

services:
app:
build:
build:
context: .
dockerfile: Dockerfile

Expand Down
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ indent_size = 2
charset = utf-8
insert_final_newline = true
end_of_line = lf
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
indent_style = space
24 changes: 19 additions & 5 deletions .github/ISSUE_TEMPLATE/01_bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,22 @@ Please include errors from the developer console and/or server log files if you
<!-- Tell us where on the platform it happens -->
<!-- DO NOT WRITE "latest". Please provide the specific version. -->

Misskey version:
PostgreSQL version:
Redis version:
Your OS:
Your browser:
### 💻 Frontend
* Model and OS of the device(s):
<!-- Example: MacBook Pro (14inch, 2021), macOS Ventura 13.4 -->
* Browser:
<!-- Example: Chrome 113.0.5672.126 -->
* Server URL:
<!-- Example: misskey.io -->
* Misskey:
13.x.x

### 🛰 Backend (for server admin)
<!-- If you are using a managed service, put that after the version. -->

* Installation Method or Hosting Service: <!-- Example: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment -->
* Misskey: 13.x.x
* Node: 20.x.x
* PostgreSQL: 15.x.x
* Redis: 7.x.x
* OS and Architecture: <!-- Example: Ubuntu 22.04.2 LTS aarch64 -->
36 changes: 0 additions & 36 deletions .github/workflows/api-misskey-js.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/check_copyright_year.yml

This file was deleted.

43 changes: 0 additions & 43 deletions .github/workflows/docker-develop.yml

This file was deleted.

49 changes: 0 additions & 49 deletions .github/workflows/docker.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/dockle.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/labeler.yml

This file was deleted.

81 changes: 0 additions & 81 deletions .github/workflows/lint.yml

This file was deleted.

Loading

0 comments on commit 7ffb49d

Please sign in to comment.