Claire b81710c02c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.		2021-01-26 14:01:30 +01:00
..
environments
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-26 14:01:30 +01:00
locales
locales-glitch
webpack
application.rb	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00
boot.rb
brakeman.ignore	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
database.yml
deploy.rb	Bump capistrano from 3.14.1 to 3.15.0 (#15537)	2021-01-18 11:10:23 +09:00
environment.rb
i18n-tasks.yml
navigation.rb
pghero.yml
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
routes.rb
secrets.yml
settings.yml
sidekiq.yml
webpacker.yml