mastodon/app/models/concerns
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
..
account_associations.rb
account_avatar.rb
account_counters.rb
account_finder_concern.rb
account_header.rb
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
expireable.rb
ldap_authenticable.rb
omniauthable.rb Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217) 2019-03-14 02:13:42 +01:00
paginable.rb
pam_authenticable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb Fix nil host in remotable (#8508) 2018-08-29 21:13:49 +02:00
status_threading_concern.rb
streamable.rb
user_roles.rb