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	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
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	…
requests	…
routing	…
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	…
rails_helper.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
spec_helper.rb	Disable simplecov on CircleCI (#7416)	2018-05-09 16:59:58 +02:00