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 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's		5 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
features	…
fixtures	Add noopener and/or noreferrer (#12202)	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mailers	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
presenters	…
requests	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
views	…
workers	Fix various issues with account migration (#12301)	5 years ago
rails_helper.rb	Fix records not being indexed sometimes (#12024)	5 years ago
spec_helper.rb	…