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 a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		4 years ago
..
exports	Export and import show_reblogs together with following list (#10495)	5 years ago
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	5 years ago
two_factor_authentication	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
applications_controller_spec.rb	lint pass 2 (#8878)	6 years ago
deletes_controller_spec.rb	Refactor settings controllers (#14767)	4 years ago
exports_controller_spec.rb	Add spec for Settings::ExportsController#create (#9512)	6 years ago
featured_tags_controller_spec.rb	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	5 years ago
flavours_controller_spec.rb	Thank you, Officer Murphy	7 years ago
identity_proofs_controller_spec.rb	Add ability to remove identity proofs from account (#13682)	4 years ago
imports_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
migrations_controller_spec.rb	Add account migration UI (#11846)	5 years ago
profiles_controller_spec.rb	Error message for avatar image that's too large. #9204 (#9518)	6 years ago
sessions_controller_spec.rb	Add missing tests for sessions controller (#7744)	6 years ago
two_factor_authentication_methods_controller_spec.rb	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago