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

..

controllers

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

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

fabricators

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

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

features

…

fixtures

…

helpers

…

lib

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

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

mailers

…

models

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

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

policies

…

presenters

…

requests

…

routing

…

serializers/activitypub

Improved remote thread fetching (#10106)

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

services

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

2019-02-28 21:35:53 +01:00

support

…

validators

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

2019-02-12 20:32:48 +01:00

views

…

workers

Improved remote thread fetching (#10106)

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

rails_helper.rb

Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)

2019-01-15 23:11:46 +01:00

spec_helper.rb

…