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

Conflicts:
 	Gemfile.lock
 	config/application.rb

2018-04-13 16:36:46 -05:00

..

chewy

…

controllers

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

2018-04-13 16:36:46 -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 'tootsuite/master'

2018-04-12 03:30:57 -05:00

lib

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

2018-04-08 19:05:02 -05:00

mailers

…

models

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

2018-04-13 16:36:46 -05:00

policies

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

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

presenters

…

serializers

retrieve custom emoji list via API instead of before page load (#7047)

2018-04-04 22:25:34 +02:00

services

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

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

validators

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

2018-03-27 10:44:12 -05:00

views

Merge remote-tracking branch 'tootsuite/master'

2018-04-12 03:30:57 -05:00

workers

Add a circuit breaker for ActivityPub deliveries (#7053)

2018-04-07 21:36:58 +02:00