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

..

activity.rb

Extract User::Activity concern (#35581)

2025-07-30 11:19:11 +00:00

confirmation.rb

Extract User::Confirmation concern (#35582)

2025-07-30 10:33:57 +00:00

has_settings.rb

Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream

2026-03-25 21:36:32 +01:00

ldap_authenticable.rb

LDAP: Fix attempted modification of frozen hash (#39571)

2026-06-23 17:35:29 +02:00

omniauthable.rb

fix: OIDC account creation fails for long display names (#34639)

2025-05-12 15:51:53 +00:00

pam_authenticable.rb

Ignore legacy moderator and admin columns on User model (#29188)

2024-02-13 20:03:00 +01:00