Claire eb3aed9545 Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream ...

Conflicts:
- `yarn.lock`:
  Upstream touched a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.

2024-03-20 12:27:52 +01:00

..

environments

…

imagemagick

…

initializers

Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream

2024-03-19 19:21:12 +01:00

locales

New Crowdin Translations (automated) (#29657)

2024-03-20 08:39:42 +00:00

locales-glitch

Fix bogus translation files

2024-02-29 12:51:22 +01:00

routes

Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream

2024-03-14 17:27:16 +01:00

templates

…

webpack

…

application.rb

…

boot.rb

…

brakeman.yml

…

database.yml

…

deploy.rb

…

environment.rb

…

formatjs-formatter.js

…

i18n-tasks.yml

…

navigation.rb

Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream

2024-03-19 19:21:12 +01:00

pghero.yml

…

puma.rb

…

roles.yml

…

routes.rb

Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream

2024-03-14 17:27:16 +01:00

secrets.yml

…

settings.yml

Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream

2024-02-24 15:35:56 +01:00

sidekiq.yml

Automatically switch from open to approved registrations in absence of moderators (#29318)

2024-02-22 20:45:40 +01:00

storage.yml

…

webpacker.yml

…