Claire 6b4e8c7467 Merge commit 'e8642389912b1059c921f0836825f12a0f2779db' into glitch-soc/merge-4.6 ...

Conflicts:
- `app/models/account.rb`:
  Upstream changed the display name length limit for local users,
  but glitch-soc has a configurable limit.
  Updated the default limit to be upstream's new limit.

2026-06-17 14:40:25 +02:00

..

environments

Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream

2026-03-11 18:50:59 +01:00

initializers

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

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

locales

New Crowdin Translations for stable-4.6 (automated) (#39469)

2026-06-17 12:33:01 +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

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

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

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

mastodon.yml

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

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

navigation.rb

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

2026-05-04 21:08:25 +02: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

Use http POST on rules acceptance button during registration (#39345)

2026-06-09 15:39:24 +00:00

settings.yml

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

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

sidekiq.yml

fixes bug Admin Mailer trends mail not displayed correctly (#39122)

2026-05-28 20:14:31 +00:00

translation.yml

…

vapid.yml

…

vite.json

…