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		2019-06-24 15:02:59 +02:00
..
account_associations.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
account_avatar.rb	Add WebP support (#9879)	2019-02-02 12:25:04 +01:00
account_counters.rb
account_finder_concern.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
account_header.rb	Add WebP support (#9879)	2019-02-02 12:25:04 +01:00
account_interactions.rb
attachmentable.rb	Fix audio-only OGG and WebM files not being processed as such (#11151)	2019-06-22 16:54:06 +02:00
cacheable.rb
domain_normalizable.rb	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
expireable.rb	Fix poll update handler calling method was that was not available (#10246)	2019-03-12 22:58:59 +01:00
ldap_authenticable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	2019-04-25 02:49:25 +02:00
omniauthable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	2019-04-25 02:49:25 +02:00
paginable.rb
pam_authenticable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	2019-04-25 02:49:25 +02:00
redisable.rb	Create Redisable#redis (#9633)	2019-02-02 19:11:38 +01:00
relationship_cacheable.rb
remotable.rb
status_threading_concern.rb	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
streamable.rb
user_roles.rb	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00