treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/config
History
Claire 42cdc6b071 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.
 		2021-05-17 10:30:34 +02:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2021-05-17 10:30:34 +02:00
locales New Crowdin updates (#16241) 2021-05-16 23:54:25 +02:00
locales-glitch Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
application.rb Fix older migrations on Ruby 3 (#16174) 2021-05-07 15:56:45 +02:00
boot.rb Add clean error message when RAILS_ENV is unset (#15381) 2020-12-20 18:05:03 +01:00
brakeman.ignore Ignore brakeman false positive warning (#16213) 2021-05-11 14:18:33 +02:00
database.yml
…
deploy.rb Bump capistrano from 3.15.0 to 3.16.0 (#15818) 2021-03-05 06:38:52 +09:00
environment.rb
…
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb
…
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
secrets.yml
…
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
sidekiq.yml Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml
…