Mirror of glitch-soc/mastodon@github.com
Go to file
Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
.devcontainer Update libretranslate/libretranslate Docker tag to v1.5.3 (#28639) 2024-01-08 09:59:06 +00:00
.github
.husky
.yarn
app Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
bin
chart
config Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
db Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
dist
lib Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
log
public
spec Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
streaming Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
vendor
.browserslistrc
.buildpacks
.dockerignore
.editorconfig
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.haml-lint_todo.yml
.nanoignore
.nvmrc
.prettierignore
.prettierrc.js
.profile
.rspec
.rubocop.yml Remove deprecated `RSpec/FilePath` cop (#28601) 2024-01-05 12:31:18 +00:00
.rubocop_todo.yml Regenerate rubocop todo with version 1.59.0 (#28597) 2024-01-05 12:26:31 +00:00
.ruby-gemset
.ruby-version
.simplecov
.slugignore
.watchmanconfig
.yarnrc.yml
AUTHORS.md
Aptfile
CHANGELOG.md
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Dockerfile
FEDERATION.md
Gemfile Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
Gemfile.lock Update dependency rubocop-performance to v1.20.2 (#28641) 2024-01-08 10:19:33 +00:00
LICENSE
Procfile
Procfile.dev
README.md
Rakefile
SECURITY.md Remove v3.5 branch from supported Mastodon versions (#28574) 2024-01-03 15:04:10 +00:00
Vagrantfile
app.json
babel.config.js
config.ru
crowdin-glitch.yml
crowdin.yml
docker-compose.yml
ide-helper.js
jest.config.js
jsconfig.json
package.json Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
postcss.config.js
priv-config
scalingo.json
stylelint.config.js
tsconfig.json
yarn.lock Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?