mastodon/app/models/concerns
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
..
account_associations.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
account_avatar.rb
account_counters.rb Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
account_finder_concern.rb
account_header.rb Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
account_interactions.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
attachmentable.rb Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935) 2018-07-03 19:47:09 +02:00
cacheable.rb
domain_normalizable.rb Create DomainNormalizable#normalize_domain (#9631) 2018-12-26 06:38:42 +01:00
expireable.rb Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
omniauthable.rb rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
paginable.rb Fix timeline pagination (#8827) 2018-09-29 19:03:33 +02:00
relationship_cacheable.rb
remotable.rb Fix nil host in remotable (#8508) 2018-08-29 21:13:49 +02:00
status_threading_concern.rb Sort self-replies to the top of descendants (#9320) 2018-11-24 20:48:50 +01:00
streamable.rb