Claire 767630be24 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile`:
  Upstream removed blank lines.

2022-11-14 20:27:31 +01:00

..

environments

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

2022-11-12 13:28:03 +01:00

initializers

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

2022-11-14 20:27:31 +01:00

locales

New Crowdin updates (#20476)

2022-11-14 01:14:31 +09:00

locales-glitch

Add back missing glitch-soc admin settings (#1919)

2022-11-12 13:24:53 +01:00

webpack

…

application.rb

Fix mailers queue not being used for mailers (#20274)

2022-11-10 02:31:09 +01:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

Change master branch to main branch (#20290)

2022-11-10 04:02:05 +01:00

environment.rb

…

i18n-tasks.yml

Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""

2022-11-12 10:17:22 +01:00

navigation.rb

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

2022-10-28 19:23:58 +02:00

pghero.yml

…

puma.rb

…

roles.yml

…

routes.rb

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

2022-11-14 20:27:31 +01:00

secrets.yml

…

settings.yml

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

2022-10-28 19:23:58 +02:00

sidekiq.yml

Change incoming activity processing to happen in ingress queue (#20264)

2022-11-10 14:21:51 +01:00

storage.yml

…

webpacker.yml

…