Claire c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did.		2024-05-29 17:03:24 +02:00
..
has_settings.rb	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream	2024-04-06 21:01:40 +02: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	Merge pull request from GHSA-vm39-j3vx-pch3	2024-02-14 15:25:15 +01:00
pam_authenticable.rb	Ignore legacy moderator and admin columns on User model (#29188)	2024-02-13 20:03:00 +01:00