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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		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	rubocop issues - Cleaning up (#8912)	6 years ago
fixtures	…
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	…
routing	…
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	…
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Lists (#5703)	7 years ago
rails_helper.rb	rubocop issues - Cleaning up (#8912)	6 years ago
spec_helper.rb	…