Claire 536892b8ae Merge branch 'main' into glitch-soc/merge-upstream		2021-04-21 13:52:03 +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-04-20 12:17:14 +02:00
locales	Add "recommended" label to activity/peers API toggles in admin UI (#16081)	2021-04-20 13:57:45 +02:00
locales-glitch
webpack
application.rb	Remove dependency on pluck_each gem (#16012)	2021-04-12 03:35:58 +02:00
boot.rb
brakeman.ignore	Fix some ignored brakeman warnings (#15829)	2021-03-07 07:06:56 +01: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
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-04-20 12:17:14 +02:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +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