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
c37bc0b268
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
Add WebP support ( #9879 )
6 years ago
account_counters.rb
Add profile directory ( #9427 )
6 years ago
account_finder_concern.rb
Use Contact User as Relay, Report, Subscribe. ( #9661 )
6 years ago
account_header.rb
Add WebP support ( #9879 )
6 years ago
account_interactions.rb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
attachmentable.rb
Restore support to ruby 2.3, add ruby 2.3 to circle ci ( #7935 )
6 years ago
cacheable.rb
Fix cache_associated no longer working ( #7320 )
7 years ago
domain_normalizable.rb
Add option to overwrite imported data ( #9962 )
6 years ago
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
Fix timeline pagination ( #8827 )
6 years ago
pam_authenticable.rb
Refactor User model, extract PamAuthenticable, LdapAuthenticable ( #10217 )
6 years ago
redisable.rb
Create Redisable#redis ( #9633 )
6 years ago
relationship_cacheable.rb
Cache relationships in API ( #6482 )
7 years ago
remotable.rb
Fix nil host in remotable ( #8508 )
6 years ago
status_threading_concern.rb
Improved remote thread fetching ( #10106 )
6 years ago
streamable.rb
Define instance method outside #included ( #3128 )
8 years ago
user_roles.rb
Refactor User model, extract PamAuthenticable, LdapAuthenticable ( #10217 )
6 years ago