David Yip dd28b94cf0 Merge remote-tracking branch 'origin/master' into gs-master		2017-10-26 09:18:27 -05:00
..
controllers	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
fabricators	Apply keyword mutes to reblogs.	2017-10-21 15:44:47 -05:00
features	…
fixtures	Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)	2017-10-26 22:48:35 +09:00
helpers	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
lib	Also filter notifications containing muted keywords.	2017-10-24 18:51:27 -05:00
mailers	Spec UserMailer (#3757)	2017-06-17 01:15:00 +02:00
models	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-26 09:18:27 -05:00
policies	…
presenters	…
requests	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
routing	…
services	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-16 01:29:02 -05:00
support	Some minor change and spec for Account (#3813)	2017-06-22 18:34:27 +02:00
validators	Fix StatusLengthValidator tests	2017-09-02 11:37:40 -05:00
views	fix haml quotes in a bid to make travis less grumpy	2017-10-06 09:07:04 +02:00
workers	Clean up reblog tracking keys, related improvements (#5428)	2017-10-17 11:45:06 +02:00
rails_helper.rb	Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)	2017-07-07 23:25:15 +02:00
spec_helper.rb	Minor performance improvement for test suite (#4678)	2017-08-24 13:31:55 +02:00