mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/models/concerns/user
History
Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
 		2024-04-06 21:01:40 +02:00
..
has_settings.rb Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 2024-04-06 21:01:40 +02:00
ldap_authenticable.rb Ignore legacy moderator and admin columns on User model (#29188) 2024-02-13 20:03:00 +01: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