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 48e6b2360d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		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	Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Add specs for list replies policy	6 years ago
mailers	Add moderation warnings (#9519)	6 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
presenters	Add specs for InstancePresenter (#9596)	6 years ago
requests	Use raw status code on have_http_status (#7214)	7 years ago
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	Remove empty strings (#5732)	7 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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	Disable simplecov on CircleCI (#7416)	7 years ago