Claire 2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.

2026-06-23 18:01:59 +02:00

..

environments

…

initializers

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

2026-06-09 21:30:54 +02:00

locales

New Crowdin translations

2026-06-23 17:57:50 +02:00

locales-glitch

New Crowdin translations (#3500)

2026-05-21 17:17:29 +02:00

routes

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

2026-06-09 21:30:54 +02:00

templates

Change Mastodon gGmbH => Mastodon GmbH (#39261)

2026-06-03 09:36:50 +00:00

vite

Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6

2026-06-16 21:49:17 +02:00

application.rb

Remove doorkeeper workaround (#39336)

2026-06-09 08:30:48 +00:00

boot.rb

…

brakeman.yml

…

cache_buster.yml

…

captcha.yml

…

database.yml

…

email.yml

…

environment.rb

…

formatjs-formatter.js

…

i18n-tasks.yml

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

2026-06-12 18:37:02 +02:00

mastodon.yml

…

navigation.rb

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

2026-05-04 21:08:25 +02:00

omniauth.yml

…

pghero.yml

…

puma.rb

…

roles.yml

…

routes.rb

Add route constraint to only allow numeric ids (#39523)

2026-06-23 11:17:54 +02:00

settings.yml

Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream

2026-04-25 09:20:39 +02:00

sidekiq.yml

Add scheduler job to repair collection attribution (#39550)

2026-06-23 11:17:55 +02:00

translation.yml

…

vapid.yml

…

vite.json

…