Jeremy Kescher 2cb88f5baa Merge remote-tracking branch 'upstream/main' into develop ... Conflicts: - .github/workflows/build-image.yml We don't use GitHub Actions for building Docker images. - Gemfile.lock Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.		2023-03-19 01:57:28 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-18 11:21:03 +01:00
initializers	Merge remote-tracking branch 'upstream/main' into develop, bump version	2023-03-17 07:27:28 +01:00
locales	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00
locales-glitch	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-13 19:35:35 +01:00
application.rb	Add cache headers to static files served through Rails (#24120)	2023-03-16 02:55:54 +01:00
boot.rb
brakeman.ignore
database.yml	Fix pgBouncer resetting application name on every transaction (#23958)	2023-03-05 01:52:42 +01:00
deploy.rb	Change master branch to main branch (#20290)	2022-11-10 04:02:05 +01:00
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	Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064)	2023-03-14 14:47:57 +01:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +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	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00