Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/settings.yml		2018-08-01 22:20:25 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
features
fixtures
helpers
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
policies	Add test to disallow remote users from fetching local-only toots	2018-07-31 15:41:04 +02:00
presenters	Isolate each specs for cache store (#6450)	2018-02-17 22:35:05 +01:00
requests
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	2018-06-12 13:17:21 +00:00
support
validators
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 22:20:25 +02:00
workers	Lists (#5703)	2017-11-18 00:16:48 +01:00
rails_helper.rb
spec_helper.rb