Mirror of glitch-soc/mastodon@github.com
Go to file
Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
.devcontainer Update mcr.microsoft.com/devcontainers/ruby Docker tag to v1 (#25613) 2023-06-27 11:28:07 +02:00
.github Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream 2023-07-12 15:54:58 +02:00
.husky
app Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
bin Move the mastodon/*_cli files to mastodon/cli/* (#24139) 2023-05-23 16:08:26 +02:00
chart
config Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
db Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
dist Add hardened headers to user-uploaded files (#25756) 2023-07-06 14:31:37 +02:00
lib Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
log
public
spec Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
streaming Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
vendor
.browserslistrc
.buildpacks
.bundler-audit.yml
.dockerignore
.editorconfig
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js Fix import order inconsistencies (#2289) 2023-07-12 15:00:10 +02:00
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
.haml-lint_todo.yml Update `haml-lint` (#25929) 2023-07-12 12:31:10 +02:00
.nanoignore
.nvmrc
.prettierignore Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
.prettierrc.js
.profile
.rspec
.rubocop.yml Run Rubocop on Rakefile (#23871) 2023-07-12 09:47:54 +02:00
.rubocop_todo.yml Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
.ruby-gemset
.ruby-version
.slugignore
.yarnclean
AUTHORS.md
Aptfile
CHANGELOG.md Fix changelog referencing wrong API version (#25857) 2023-07-11 14:53:58 +02:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Capfile
Dockerfile
FEDERATION.md
Gemfile Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream 2023-07-12 15:54:58 +02:00
Gemfile.lock Update dependency capistrano-rails to v1.6.3 (#25934) 2023-07-12 14:19:51 +02:00
LICENSE
Procfile
Procfile.dev
README.md
Rakefile Run Rubocop on Rakefile (#23871) 2023-07-12 09:47:54 +02:00
SECURITY.md
Vagrantfile
app.json
babel.config.js Update babel monorepo to v7.22.5 (#25405) 2023-06-14 09:22:54 +02:00
config.ru
crowdin-glitch.yml
crowdin.yml Update Crowdin configuration file 2023-06-30 16:22:40 +02:00
docker-compose.yml
ide-helper.js
jest.config.js Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
jsconfig.json
package.json Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
postcss.config.js
priv-config
scalingo.json
stylelint.config.js
tsconfig.json Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream 2023-05-28 13:55:30 +02:00
yarn.lock Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02: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?