Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.

2024-05-01 19:38:34 +02:00

..

environments

Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream

2024-01-26 20:47:20 +01:00

imagemagick

…

initializers

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

2024-05-01 19:38:34 +02:00

locales

New Crowdin Translations (automated) (#29994)

2024-04-19 13:57:43 +00:00

locales-glitch

New Crowdin Translations (automated) (#2668)

2024-04-06 18:18:06 +02:00

routes

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

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

templates

…

webpack

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

application.rb

…

boot.rb

Use abort instead of warn(); exit in boot.rb env check (#29209)

2024-02-16 14:29:24 +00:00

brakeman.yml

…

database.yml

…

deploy.rb

…

environment.rb

…

formatjs-formatter.js

…

i18n-tasks.yml

…

navigation.rb

Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream

2024-04-06 19:35:21 +02:00

pghero.yml

…

puma.rb

…

roles.yml

…

routes.rb

Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream

2024-04-06 19:35:21 +02:00

secrets.yml

…

settings.yml

Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream

2024-05-01 14:25:47 +02: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

…