Jeremy Kescher f1a71785b9 Merge remote-tracking branch 'upstream/main' into develop		2023-05-08 18:40:08 +02:00
..
environments	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
initializers	Merge remote-tracking branch 'upstream/main' into develop	2023-05-08 18:40:08 +02:00
locales	Merge remote-tracking branch 'upstream/main' into develop	2023-05-08 18:40:08 +02:00
locales-glitch	Update emoji reaction patches	2023-05-07 22:01:04 +02:00
webpack	Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208)	2023-05-07 18:22:25 +02:00
application.rb	Remove tai locale (#23880)	2023-04-23 22:49:07 +02: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
routes.rb	Merge remote-tracking branch 'upstream/main' into develop	2023-05-08 18:40:08 +02:00
secrets.yml
settings.yml	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02: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-04-03 17:40:59 +02:00