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

…

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

…

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

…

streamable.rb

…

user_roles.rb

…