You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
account_associations.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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)	6 years ago
ldap_authenticable.rb	Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)	6 years ago
omniauthable.rb	Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)	6 years ago
paginable.rb	…
pam_authenticable.rb	Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)	6 years ago
redisable.rb	…
relationship_cacheable.rb	…
remotable.rb	…
status_threading_concern.rb	Improved remote thread fetching (#10106)	6 years ago
streamable.rb	…
user_roles.rb	Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)	6 years ago