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 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.		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	Fix admin validation being too strict about usernames (#10449)	6 years ago
account_header.rb	…
account_interactions.rb	…
attachmentable.rb	…
cacheable.rb	Fix cache_associated no longer working (#7320)	7 years ago
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	…
streamable.rb	…
user_roles.rb	Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)	6 years ago