Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.		2018-10-30 17:52:08 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
features	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
fixtures	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-29 14:09:54 +01:00
mailers	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +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	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
routing	…
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
support	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00
validators	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:44:12 -05:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
workers	Lists (#5703)	2017-11-18 00:16:48 +01:00
rails_helper.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
spec_helper.rb	Disable simplecov on CircleCI (#7416)	2018-05-09 16:59:58 +02:00