djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 01:24:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
3789d9f825
tootlab-mastodon/app/models/concerns/user
History
Claire 3789d9f825 Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
2024-05-04 16:28:30 +02:00
..
has_settings.rb Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 2024-04-06 21:01:40 +02:00
ldap_authenticable.rb Fix local account search on LDAP login being case-sensitive (#30113) 2024-05-03 09:22:48 +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