You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/settings.yml		6 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	…
fixtures	Slightly reduce RAM usage (#7301)	7 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	Add test to disallow remote users from fetching local-only toots	6 years ago
presenters	…
requests	Use raw status code on have_http_status (#7214)	7 years ago
routing	…
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
support	…
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	…
rails_helper.rb	Slightly reduce RAM usage (#7301)	7 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago