Jeremy Kescher 8de39432a9 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock # app/javascript/flavours/glitch/actions/interactions.js # config/initializers/rack_attack.rb # config/locales/en_GB.yml		2023-02-17 00:26:21 +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-17 00:26:21 +01:00
locales-glitch	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00
webpack	Change locales file generation to use JSON sources (#2028)	2022-12-21 22:13:14 +01:00
application.rb	Address check-i18n warnings (#23313)	2023-02-02 10:14:19 +09:00
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	2021-09-19 14:42:32 +09:00
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
database.yml	Change postgres connection timeout (#21790)	2022-12-07 00:39:36 +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	feat(puma): enable setting min puma threads in addition to max (#21048)	2023-01-06 07:55:58 +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-01-18 22:29:27 +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	2022-12-16 17:53:33 +01:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml