Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.

2024-03-05 16:25:50 +01:00

..

environments

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

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

imagemagick

…

initializers

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

2024-03-05 16:25:50 +01:00

locales

New welcome email (#28883)

2024-03-01 12:16:53 +00:00

locales-glitch

Fix bogus translation files

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

routes

Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream

2024-01-25 19:51:19 +01:00

templates

Move privacy policy into markdown file (#28699)

2024-01-19 11:22:23 +00:00

webpack

Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream

2024-01-16 12:04:11 +01:00

application.rb

Enable Rails 7.1 Marshalling format (#28609)

2024-01-05 21:57:47 +00:00

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

Fix Lint/SymbolConversion cop (#28175)

2023-12-01 15:53:35 +00:00

environment.rb

…

formatjs-formatter.js

…

i18n-tasks.yml

Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

navigation.rb

…

pghero.yml

…

puma.rb

…

roles.yml

…

routes.rb

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

2024-02-24 14:18: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

…