David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
controllers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
fabricators	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-24 05:17:10 +00:00
features	Add scenarios for log in (#3497)	2017-06-01 17:25:59 +02:00
fixtures	Added FetchRemoteAccountService spec (#6456)	2018-02-10 17:10:57 +01:00
helpers	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-16 22:52:37 -06:00
lib	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
mailers	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
models	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
policies	Update StatusPolicy to check current_account for local_only? toots.	2017-11-17 09:07:21 -06:00
presenters	Isolate each specs for cache store (#6450)	2018-02-17 22:35:05 +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 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06: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	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
workers	Lists (#5703)	2017-11-18 00:16:48 +01:00
rails_helper.rb	Isolate each specs for cache store (#6450)	2018-02-17 22:35:05 +01:00
spec_helper.rb	Full-text search for authorized statuses (#6423)	2018-02-09 23:04:47 +01:00