Claire 1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.

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

..

environments

…

imagemagick

…

initializers

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

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

locales

Add service to add item to a collection (#37192)

2025-12-10 16:59:21 +00:00

locales-glitch

Update simple_form.no.yml

2025-11-11 12:15:55 +01:00

routes

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

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

templates

…

vite

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

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

application.rb

…

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

…

i18n-tasks.yml

…

mastodon.yml

…

navigation.rb

…

omniauth.yml

…

pghero.yml

…

puma.rb

…

roles.yml

…

routes.rb

Add shareable wrapstodon links (#37047)

2025-12-03 11:00:41 +00:00

settings.yml

…

sidekiq.yml

…

translation.yml

…

vapid.yml

…

vite.json

…