David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.

2018-06-07 05:13:49 -05:00

..

chewy

…

controllers

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

2018-06-03 19:44:05 -05:00

helpers

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

2018-05-19 22:41:10 +02:00

javascript

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

lib

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

2018-06-02 16:15:36 -05:00

mailers

…

models

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

policies

…

presenters

…

serializers

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

2018-05-29 13:52:26 +02:00

services

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

validators

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

2018-05-29 13:52:26 +02:00

views

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

workers

Speed up some rake tasks by moving execution to Sidekiq (#7678)

2018-05-30 21:09:30 +02:00