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 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		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	Record account suspend/silence time and keep track of domain blocks (#10660)	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	Fix audio-only OGG and WebM files not being processed as such (#11151)	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	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	6 years ago
omniauthable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	6 years ago
paginable.rb	Fix timeline pagination (#8827)	6 years ago
pam_authenticable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	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	Add moderation API (#9387)	6 years ago