Jeremy Kescher 0e634397c3 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock		2023-02-21 00:40:08 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-10 14:43:38 +01:00
initializers	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00
locales	Merge remote-tracking branch 'upstream/main' into develop	2023-02-21 00:40:08 +01:00
locales-glitch	Merge remote-tracking branch 'upstream/main' into develop	2023-02-18 22:38:53 +01:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-13 19:35:35 +01:00
application.rb	Address check-i18n warnings (#23313)	2023-02-02 10:14:19 +09:00
boot.rb
brakeman.ignore
database.yml	Change postgres connection timeout (#21790)	2022-12-07 00:39:36 +01:00
deploy.rb
environment.rb
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
pghero.yml
puma.rb	feat(puma): enable setting min puma threads in addition to max (#21048)	2023-01-06 07:55:58 +01:00
roles.yml
routes.rb	Merge remote-tracking branch 'upstream/main' into develop	2023-02-21 00:40:08 +01:00
secrets.yml
settings.yml	Merge remote-tracking branch 'upstream/main' into develop	2023-01-18 22:29:27 +01:00
sidekiq.yml	Merge remote-tracking branch 'upstream/main' into develop	2023-02-18 22:38:53 +01:00
storage.yml
webpacker.yml