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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		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	Account archive download (#6460)	7 years ago
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	Isolate each specs for cache store (#6450)	7 years ago
requests	Use raw status code on have_http_status (#7214)	7 years ago
routing	…
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