Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

2019-03-05 19:23:16 +01:00

..

account_associations.rb

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

2019-03-05 19:23:16 +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

Use Contact User as Relay, Report, Subscribe. (#9661)

2019-01-05 07:17:12 +01: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

…

cacheable.rb

…

domain_normalizable.rb

Add option to overwrite imported data (#9962)

2019-02-03 03:59:51 +01:00

expireable.rb

…

omniauthable.rb

Fix SSO authentication not working due to missing agreement boolean (#9915)

2019-01-25 12:36:54 +01:00

paginable.rb

Fix timeline pagination (#8827)

2018-09-29 19:03:33 +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

…