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

Add profile directory (#9427)

2018-12-06 17:36:11 +01:00

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

Merge branch 'master' into glitch-soc/merge-upstream

2018-11-27 13:23:02 +01:00

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

Fix cache_associated no longer working (#7320)

2018-05-03 10:41:41 +02:00

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

Fix timeline pagination (#8827)

2018-09-29 19:03:33 +02:00

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

Cache relationships in API (#6482)

2018-02-18 03:14:46 +01:00

remotable.rb

Fix nil host in remotable (#8508)

2018-08-29 21:13:49 +02:00

status_threading_concern.rb

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

streamable.rb

Define instance method outside #included (#3128)

2017-05-19 11:41:45 +02:00

user_roles.rb

Add moderation API (#9387)

2019-06-20 02:52:34 +02:00