Claire b4aabf3cf1 Merge branch 'main' into glitch-soc/merge

2023-01-02 17:29:59 +01:00

..

environments

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-17 12:01:37 +01:00

initializers

Merge branch 'main' into glitch-soc/merge-upstream

2022-12-15 20:25:25 +01:00

locales

New Crowdin updates (#22560)

2023-01-01 21:31:53 +09:00

locales-glitch

New Crowdin updates (#2048)

2022-12-30 18:31:26 +01:00

webpack

Change locales file generation to use JSON sources (#2028)

2022-12-21 22:13:14 +01:00

application.rb

Add Western Frisian support (#18602)

2022-12-15 19:03:44 +01: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

Change i18n-tasks config to consider glitch-soc translation files (#2027)

2022-12-21 22:13:04 +01:00

navigation.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-17 12:01:37 +01:00

pghero.yml

…

puma.rb

…

roles.yml

…

routes.rb

Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)

2022-11-17 11:05:09 +01:00

secrets.yml

…

settings.yml

…

sidekiq.yml

Add environment variable to configure sidekiq concurrency (#19589)

2022-12-15 16:38:37 +01:00

storage.yml

…

webpacker.yml

…