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
..
account_controller_concern.rb	Add ActivityPub secure mode (#11269)	5 years ago
account_owned_concern.rb	Add whitelist mode (#11291)	5 years ago
accountable_concern.rb	Add logging of admin actions (#5757)	7 years ago
authorization.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
cache_concern.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
challengable_concern.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
export_controller_concern.rb	Refactor settings controllers (#14767)	4 years ago
localized.rb	Fix not working I18n on 2FA and Sign in token page (#14087)	4 years ago
rate_limit_headers.rb	Add specific rate limits for posting and following (#13172)	4 years ago
session_tracking_concern.rb	Update session activation time (fixes #5605) (#7408)	6 years ago
sign_in_token_authentication_concern.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
signature_authentication.rb	Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)	6 years ago
signature_verification.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
status_controller_concern.rb	Refactor controllers for statuses, accounts, and more (#11249)	5 years ago
two_factor_authentication_concern.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
user_tracking_concern.rb	Fix #6331 (#6341)	6 years ago