Claire 5a5560ca45 Merge commit '3ed16489d05d701e62be5038adbe2891c1a3ac1d' into glitch-soc/merge-upstream ...

Conflicts:
- `yarn.lock`:
  Upstream dependency updated textually adjacent to glitch-soc dependency

2026-02-24 12:01:25 +01:00

..

environments

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

2026-02-05 17:57:46 +01:00

initializers

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

2026-02-12 18:00:45 +01:00

locales

New Crowdin Translations (automated) (#37956)

2026-02-24 09:08:25 +00:00

locales-glitch

New Crowdin translations (#3382)

2026-02-14 22:03:41 +01:00

routes

Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream

2026-02-20 21:08:06 +01:00

templates

…

vite

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

2025-12-15 20:22:20 +01:00

application.rb

Remove deprecated usage of imagemagick (#37488)

2026-01-22 14:57:19 +00:00

boot.rb

Upgrade rubocop-rails from 2.33.4 to 2.34.2 and address related offenses (#37243)

2025-12-15 12:57:16 +00:00

brakeman.yml

…

cache_buster.yml

…

captcha.yml

…

database.yml

…

email.yml

…

environment.rb

…

formatjs-formatter.js

Fix formatting issues, remove unused JS script

2026-02-20 20:47:50 +01:00

i18n-tasks.yml

…

mastodon.yml

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

2026-02-17 12:11:33 +01:00

navigation.rb

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

2025-11-03 21:04:45 +01:00

omniauth.yml

…

pghero.yml

…

puma.rb

Rely on puma default environment setting (#36760)

2025-11-07 10:06:22 +00:00

roles.yml

Fix default Admin role not including view_feeds permission (#37301)

2025-12-18 14:26:31 +00:00

routes.rb

Profile redesign: About tab (#37851)

2026-02-13 13:37:39 +00:00

settings.yml

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

2026-02-11 13:32:18 +01:00

sidekiq.yml

…

translation.yml

…

vapid.yml

…

vite.json

…