treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/config
History
Claire 8391d975d7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.
 		2021-08-09 23:25:49 +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-07-17 17:45:35 +02:00
locales Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
locales-glitch Fix typo on simple_form.ko.yml 2021-08-06 20:06:05 +02:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2021-06-25 10:44:06 +02:00
application.rb New Crowdin updates (#16269) 2021-05-20 00:19:52 +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 Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02: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-08-09 23:25:49 +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 Add PERSISTENT_TIMEOUT option (#11756) 2019-09-04 20:44:08 +02:00
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +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 feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml
…