mastodon/app/models/concerns
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
account_associations.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
account_avatar.rb Remove WebP support (#11589) 2019-08-17 22:04:15 +02:00
account_counters.rb Add `tootctl cache recount` command (#11597) 2019-08-18 14:55:03 +02:00
account_finder_concern.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00
account_header.rb Remove WebP support (#11589) 2019-08-17 22:04:15 +02:00
account_interactions.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
attachmentable.rb Fix performance of GIF re-encoding (#12057) 2019-10-03 01:09:12 +02:00
cacheable.rb
domain_normalizable.rb Fix crash when saving invalid domain name (#11528) 2019-08-08 23:04:19 +02:00
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 authentication before 2FA challenge (#11943) 2019-09-24 04:35:36 +02:00
omniauthable.rb Fix SSO login not using existing account when e-mail is verified (#11862) 2019-09-16 20:42:29 +02:00
paginable.rb Fix timeline pagination (#8827) 2018-09-29 19:03:33 +02:00
pam_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
redisable.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
relationship_cacheable.rb
remotable.rb Fix attachment not being re-downloaded even if file is not stored (#12125) 2019-10-09 07:10:46 +02:00
status_threading_concern.rb Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
user_roles.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00