mastodon/app/models/concerns
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
..
account_associations.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
account_avatar.rb
account_counters.rb
account_finder_concern.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00
account_header.rb
account_interactions.rb
attachmentable.rb Fix support for MP4 files that are actually M4V files (#11210) 2019-06-30 16:10:43 +02:00
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 Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +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
user_roles.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00