You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/models/concerns
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
7 years ago
..
account_associations.rb Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
account_avatar.rb Add WebP support (#9879) 7 years ago
account_counters.rb Add profile directory (#9427) 7 years ago
account_finder_concern.rb Record account suspend/silence time and keep track of domain blocks (#10660) 7 years ago
account_header.rb Add WebP support (#9879) 7 years ago
account_interactions.rb Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
attachmentable.rb Fix audio-only OGG and WebM files not being processed as such (#11151) 7 years ago
cacheable.rb Fix cache_associated no longer working (#7320) 8 years ago
domain_normalizable.rb Add option to overwrite imported data (#9962) 7 years ago
expireable.rb Fix poll update handler calling method was that was not available (#10246) 7 years ago
ldap_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 7 years ago
omniauthable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 7 years ago
paginable.rb Fix timeline pagination (#8827) 8 years ago
pam_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 7 years ago
redisable.rb Create Redisable#redis (#9633) 7 years ago
relationship_cacheable.rb Cache relationships in API (#6482) 8 years ago
remotable.rb Fix nil host in remotable (#8508) 8 years ago
status_threading_concern.rb Improved remote thread fetching (#10106) 7 years ago
streamable.rb
user_roles.rb Add moderation API (#9387) 7 years ago