forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'glitch-branch' of https://github.com/meemudotorg/mastodon…
… into justletmeupdatemeemuplease
- Loading branch information
Showing
3,445 changed files
with
114,809 additions
and
79,600 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
--- | ||
ignore: | ||
- CVE-2015-9284 # Mitigation following https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284#mitigating-in-rails-applications | ||
# devise-two-factor advisory about brute-forcing TOTP | ||
# We have rate-limits on authentication endpoints in place (including second | ||
# factor verification) since Mastodon v3.2.0 | ||
- CVE-2024-0227 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
{ | ||
"name": "Mastodon on GitHub Codespaces", | ||
"dockerComposeFile": "../docker-compose.yml", | ||
"service": "app", | ||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", | ||
|
||
"features": { | ||
"ghcr.io/devcontainers/features/sshd:1": {}, | ||
}, | ||
|
||
"runServices": ["app", "db", "redis"], | ||
|
||
"forwardPorts": [3000, 4000], | ||
|
||
"portsAttributes": { | ||
"3000": { | ||
"label": "web", | ||
"onAutoForward": "notify", | ||
}, | ||
"4000": { | ||
"label": "stream", | ||
"onAutoForward": "silent", | ||
}, | ||
}, | ||
|
||
"otherPortsAttributes": { | ||
"onAutoForward": "silent", | ||
}, | ||
|
||
"remoteEnv": { | ||
"LOCAL_DOMAIN": "${localEnv:CODESPACE_NAME}-3000.app.github.dev", | ||
"LOCAL_HTTPS": "true", | ||
"STREAMING_API_BASE_URL": "https://${localEnv:CODESPACE_NAME}-4000.app.github.dev", | ||
"DISABLE_FORGERY_REQUEST_PROTECTION": "true", | ||
"ES_ENABLED": "", | ||
"LIBRE_TRANSLATE_ENDPOINT": "", | ||
}, | ||
|
||
"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}", | ||
"postCreateCommand": ".devcontainer/post-create.sh", | ||
"waitFor": "postCreateCommand", | ||
|
||
"customizations": { | ||
"vscode": { | ||
"settings": {}, | ||
"extensions": ["EditorConfig.EditorConfig", "webben.browserslist"], | ||
}, | ||
}, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,41 @@ | ||
// For more details, see https://aka.ms/devcontainer.json. | ||
{ | ||
"name": "Mastodon", | ||
"name": "Mastodon on local machine", | ||
"dockerComposeFile": "docker-compose.yml", | ||
"service": "app", | ||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", | ||
|
||
// Features to add to the dev container. More info: https://containers.dev/features. | ||
"features": { | ||
"ghcr.io/devcontainers/features/sshd:1": {} | ||
"ghcr.io/devcontainers/features/sshd:1": {}, | ||
}, | ||
|
||
// Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
// This can be used to network with other containers or the host. | ||
"forwardPorts": [3000, 4000], | ||
|
||
// Use 'postCreateCommand' to run commands after the container is created. | ||
"portsAttributes": { | ||
"3000": { | ||
"label": "web", | ||
"onAutoForward": "notify", | ||
"requireLocalPort": true, | ||
}, | ||
"4000": { | ||
"label": "stream", | ||
"onAutoForward": "silent", | ||
"requireLocalPort": true, | ||
}, | ||
}, | ||
|
||
"otherPortsAttributes": { | ||
"onAutoForward": "silent", | ||
}, | ||
|
||
"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}", | ||
"postCreateCommand": ".devcontainer/post-create.sh", | ||
"waitFor": "postCreateCommand", | ||
|
||
// Configure tool-specific properties. | ||
"customizations": { | ||
// Configure properties specific to VS Code. | ||
"vscode": { | ||
// Set *default* container specific settings.json values on container create. | ||
"settings": {}, | ||
// Add the IDs of extensions you want installed when the container is created. | ||
"extensions": ["EditorConfig.EditorConfig", "webben.browserslist"] | ||
} | ||
} | ||
"extensions": ["EditorConfig.EditorConfig", "webben.browserslist"], | ||
}, | ||
}, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
public/system | ||
public/assets | ||
public/packs | ||
public/packs-test | ||
node_modules | ||
neo4j | ||
vendor/bundle | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Node.js | ||
NODE_ENV=tests | ||
# In test, compile the NodeJS code as if we are in production | ||
NODE_ENV=production | ||
# Federation | ||
LOCAL_DOMAIN=cb6e6126.ngrok.io | ||
LOCAL_HTTPS=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.