You cannot 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 f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		5 years ago
..
exports	Add CSV export for lists and domain blocks (#9677)	7 years ago
migration	Add (back) option to set redirect notice on account without moving followers (#11994)	6 years ago
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	6 years ago
two_factor_authentication	Add password challenge to 2FA settings, e-mail notifications (#11878)	6 years ago
aliases_controller.rb	Addition of update activity distribution by alias, minor correction (#11905)	6 years ago
applications_controller.rb	Revert some refactoring in order to make codebase closer to upstream	6 years ago
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
deletes_controller.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	6 years ago
exports_controller.rb	Add account migration UI (#11846)	6 years ago
featured_tags_controller.rb	Fix pinned statuses being shown in a featured hashtag (#9971)	6 years ago
flavours_controller.rb	Revert some refactoring in order to make codebase closer to upstream	6 years ago
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
imports_controller.rb	Fix ImportsController param to permit :mode (#13347)	5 years ago
migrations_controller.rb	Fix account migration not affecting followers on origin server (#11980)	6 years ago
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
profiles_controller.rb	Fix base64-encoded file uploads not being possible (#12748)	5 years ago
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
two_factor_authentications_controller.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	6 years ago