David Yip 813da6788e

Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	db/schema.rb

2018-04-14 09:12:50 -05:00

..

chewy

Full-text search for authorized statuses (#6423)

2018-02-09 23:04:47 +01:00

controllers

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-14 09:12:50 -05:00

helpers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-11 00:50:09 +00:00

javascript

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-14 09:12:50 -05:00

lib

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-14 09:12:50 -05:00

mailers

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

models

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-14 09:12:50 -05:00

policies

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-11 00:50:09 +00:00

presenters

Add backend support for bookmarks

2018-04-11 20:40:29 +02:00

serializers

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-14 09:12:50 -05:00

services

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-14 09:12:50 -05:00

validators

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-14 09:17:23 +00:00

views

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-14 09:12:50 -05:00

workers

Ensure SynchronizeFeaturedCollectionWorker is unique and clean up (#7043)

2018-04-13 01:27:22 +02:00