mastodon/app/models/concerns
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
..
account_associations.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +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 Include max image dimensions in error (#11552) 2019-08-15 20:20:20 +02:00
cacheable.rb Fix cache_associated no longer working (#7320) 2018-05-03 10:41:41 +02:00
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 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 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 Cache relationships in API (#6482) 2018-02-18 03:14:46 +01:00
remotable.rb Add retry for failed media downloads and `tootctl media refresh` (#11775) 2019-09-10 15:29:12 +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