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	Fix typo: you -> your (#15476)	2021-01-07 09:32:16 +01: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	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00
boot.rb	Add clean error message when RAILS_ENV is unset (#15381)	2020-12-20 18:05:03 +01:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
pghero.yml
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
secrets.yml
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
sidekiq.yml	Fix to isolate the sidekiq process that runs the scheduler job (#15314)	2020-12-15 03:04:03 +01:00
webpacker.yml