David Yip e931cf656d

Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions ...

Conflicts:
 	app/models/glitch/keyword_mute.rb

2018-06-12 16:39:30 -05:00

..

chewy

…

controllers

Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 16:39:30 -05:00

helpers

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

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

javascript

Delete references to removed constants (fixes #537)

2018-06-09 18:14:23 +02:00

lib

Thread scopes through #matches?. #454.

2018-06-03 23:00:50 -05:00

mailers

…

models

Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 16:39:30 -05:00

policies

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

2018-05-03 17:23:44 -05:00

presenters

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

2018-05-04 18:17:32 +00:00

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 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 16:39:30 -05:00

workers

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

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