David Yip 82b2e224a2 Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb		2017-12-15 12:20:56 -06:00
..
controllers	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
fabricators	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
features
fixtures	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00
helpers	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-16 22:52:37 -06:00
lib	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-30 03:17:12 +00:00
mailers	Spec UserMailer (#3757)	2017-06-17 01:15:00 +02:00
models	Examples for Status.as_public_timeline.	2017-12-14 02:57:59 -06:00
policies	Update StatusPolicy to check current_account for local_only? toots.	2017-11-17 09:07:21 -06:00
presenters	Add tests for AccountRelationshipsPresenter (#5805)	2017-11-24 14:41:04 +01:00
requests	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	2017-06-10 09:39:26 +02:00
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-06 20:17:13 +00:00
support	Remove empty strings (#5732)	2017-11-17 10:52:30 +09: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	Lists (#5703)	2017-11-18 00:16:48 +01: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