Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.		2022-01-23 18:24:01 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-16 18:11:20 +01:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-23 18:24:01 +01:00
locales	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	2022-01-23 15:52:58 +01:00
locales-glitch	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
webpack
application.rb	Add S3_FORCE_SINGLE_REQUEST env var to work around S3 compatibility issues (#16866)	2021-10-18 18:29:04 +02:00
boot.rb
brakeman.ignore	Fix error-prone SQL queries (#15828)	2022-01-23 18:10:10 +01: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
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
pghero.yml
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	2022-01-19 23:52:48 +01:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
sidekiq.yml	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
storage.yml
webpacker.yml