Claire 22e3c0e745 Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.

2025-10-17 19:00:18 +02:00

..

environments

…

imagemagick

…

initializers

Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream

2025-09-13 11:12:22 +02:00

locales

Add new "quick boosting" setting (#36516)

2025-10-17 13:02:47 +00:00

locales-glitch

New Crowdin Translations (automated) (#3224)

2025-10-10 18:52:05 +02:00

routes

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

templates

…

vite

…

application.rb

…

boot.rb

…

brakeman.yml

…

cache_buster.yml

…

captcha.yml

…

database.yml

…

email.yml

…

environment.rb

…

formatjs-formatter.js

…

i18n-tasks.yml

…

mastodon.yml

…

navigation.rb

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

omniauth.yml

…

pghero.yml

…

puma.rb

Update to puma 7 (#36238)

2025-09-23 13:40:04 +00:00

roles.yml

…

routes.rb

Fix some routes for numeric AP identifiers (#36304)

2025-09-30 15:09:59 +00:00

settings.yml

Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream

2025-10-14 18:01:40 +02:00

sidekiq.yml

…

translation.yml

…

vapid.yml

…

vite.json

…