Claire 5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.

2025-05-14 13:38:23 +02:00

..

has_settings.rb

Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

2024-12-25 18:01:37 +01:00

ldap_authenticable.rb

Consolidate account scopes for LOWER (index using) username/domain queries (#30451)

2024-05-28 14:11:31 +00: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