mastodon/app/models/concerns
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
..
account_associations.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
account_avatar.rb
account_counters.rb
account_finder_concern.rb Fix admin validation being too strict about usernames (#10449) 2019-04-06 17:53:17 +02:00
account_header.rb
account_interactions.rb
attachmentable.rb
cacheable.rb
domain_normalizable.rb
expireable.rb Fix poll update handler calling method was that was not available (#10246) 2019-03-12 22:58:59 +01:00
ldap_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
omniauthable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
paginable.rb
pam_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
redisable.rb
relationship_cacheable.rb
remotable.rb
status_threading_concern.rb Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
streamable.rb
user_roles.rb Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217) 2019-03-14 02:13:42 +01:00