Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.

2019-03-20 13:54:00 +01:00

..

account_associations.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-20 13:54:00 +01:00

account_avatar.rb

…

account_counters.rb

…

account_finder_concern.rb

…

account_header.rb

…

account_interactions.rb

…

attachmentable.rb

…

cacheable.rb

…

domain_normalizable.rb

…

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

Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)

2019-03-14 02:13:42 +01:00

omniauthable.rb

Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)

2019-03-14 02:13:42 +01:00

paginable.rb

…

pam_authenticable.rb

Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)

2019-03-14 02:13:42 +01:00

redisable.rb

…

relationship_cacheable.rb

…

remotable.rb

…

status_threading_concern.rb

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

streamable.rb

…

user_roles.rb

Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)

2019-03-14 02:13:42 +01:00