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	Refactor settings controllers (#14767)	4 years ago
migration	Refactor settings controllers (#14767)	4 years ago
preferences	…
two_factor_authentication	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
aliases_controller.rb	Refactor settings controllers (#14767)	4 years ago
applications_controller.rb	Refactor settings controllers (#14767)	4 years ago
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
deletes_controller.rb	Change account suspensions to be reversible by default (#14726)	4 years ago
exports_controller.rb	Refactor settings controllers (#14767)	4 years ago
featured_tags_controller.rb	Refactor settings controllers (#14767)	4 years ago
flavours_controller.rb	…
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
imports_controller.rb	Refactor settings controllers (#14767)	4 years ago
migrations_controller.rb	Refactor settings controllers (#14767)	4 years ago
pictures_controller.rb	Refactor settings controllers (#14767)	4 years ago
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
profiles_controller.rb	Refactor settings controllers (#14767)	4 years ago
sessions_controller.rb	Refactor settings controllers (#14767)	4 years ago
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	4 years ago