.gitlab/CODEOWNERS

@@ -802,35 +802,35 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/user/workspace/index.md @fneill
 
 [Authentication and Authorization]
-/app/assets/javascripts/access_tokens @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/authentication @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/authentication/ @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/ide/components/shared/tokened_input.vue @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/invite_members/components/members_token_select.vue @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/logs/components/tokens @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/packages_and_registries/package_registry/components/list/tokens @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/admin/impersonation_tokens @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/groups/settings/access_tokens @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/ldap @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/oauth @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/omniauth_callbacks @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/profiles/password_prompt @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/profiles/personal_access_tokens @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/profiles/two_factor_auths @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/pages/projects/settings/access_tokens @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/logs/components/tokens/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/packages_and_registries/package_registry/components/list/tokens/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/admin/impersonation_tokens/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/groups/settings/access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/ldap/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/oauth/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/omniauth_callbacks/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/profiles/password_prompt/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/profiles/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/profiles/two_factor_auths/ @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/pages/projects/settings/access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/pages/sessions/new/oauth_remember_me.js @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/pipelines/components/pipelines_list/tokens/constants.js @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_source_token.vue @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_status_token.vue @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/projects/settings/topics/components @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/projects/settings/topics/components/ @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/related_issues/components/issue_token.vue @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/runner/components/registration/registration_token.vue @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/runner/components/registration/registration_token_reset_dropdown_item.vue @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/runner/components/search_tokens @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/runner/components/search_tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/static_site_editor/rich_content_editor/services/renderers/build_uneditable_token.js @gitlab-org/manage/authentication-and-authorization
-/app/assets/javascripts/token_access/components @gitlab-org/manage/authentication-and-authorization
+/app/assets/javascripts/token_access/components/ @gitlab-org/manage/authentication-and-authorization
 /app/assets/javascripts/token_access/index.js @gitlab-org/manage/authentication-and-authorization
 /app/assets/stylesheets/page_bundles/profile_two_factor_auth.scss @gitlab-org/manage/authentication-and-authorization
 /app/controllers/admin/impersonation_tokens_controller.rb @gitlab-org/manage/authentication-and-authorization
@@ -845,8 +845,8 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /app/controllers/concerns/snippet_authorizations.rb @gitlab-org/manage/authentication-and-authorization
 /app/controllers/concerns/workhorse_authorization.rb @gitlab-org/manage/authentication-and-authorization
 /app/controllers/groups/settings/access_tokens_controller.rb @gitlab-org/manage/authentication-and-authorization
-/app/controllers/ldap @gitlab-org/manage/authentication-and-authorization
-/app/controllers/oauth @gitlab-org/manage/authentication-and-authorization
+/app/controllers/ldap/ @gitlab-org/manage/authentication-and-authorization
+/app/controllers/oauth/ @gitlab-org/manage/authentication-and-authorization
 /app/controllers/omniauth_callbacks_controller.rb @gitlab-org/manage/authentication-and-authorization
 /app/controllers/passwords_controller.rb @gitlab-org/manage/authentication-and-authorization
 /app/controllers/profiles/passwords_controller.rb @gitlab-org/manage/authentication-and-authorization
@@ -854,7 +854,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /app/controllers/profiles/two_factor_auths_controller.rb @gitlab-org/manage/authentication-and-authorization
 /app/controllers/profiles/webauthn_registrations_controller.rb @gitlab-org/manage/authentication-and-authorization
 /app/controllers/projects/settings/access_tokens_controller.rb @gitlab-org/manage/authentication-and-authorization
-/app/finders/groups/projects_requiring_authorizations_refresh @gitlab-org/manage/authentication-and-authorization
+/app/finders/groups/projects_requiring_authorizations_refresh/ @gitlab-org/manage/authentication-and-authorization
 /app/finders/personal_access_tokens_finder.rb @gitlab-org/manage/authentication-and-authorization
 /app/helpers/access_tokens_helper.rb @gitlab-org/manage/authentication-and-authorization
 /app/helpers/auth_helper.rb @gitlab-org/manage/authentication-and-authorization
@@ -863,7 +863,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /app/models/concerns/mirror_authentication.rb @gitlab-org/manage/authentication-and-authorization
 /app/models/concerns/select_for_project_authorization.rb @gitlab-org/manage/authentication-and-authorization
 /app/models/concerns/token_authenticatable.rb @gitlab-org/manage/authentication-and-authorization
-/app/models/concerns/token_authenticatable_strategies @gitlab-org/manage/authentication-and-authorization
+/app/models/concerns/token_authenticatable_strategies/ @gitlab-org/manage/authentication-and-authorization
 /app/models/oauth_access_grant.rb @gitlab-org/manage/authentication-and-authorization
 /app/models/oauth_access_token.rb @gitlab-org/manage/authentication-and-authorization
 /app/models/personal_access_token.rb @gitlab-org/manage/authentication-and-authorization
@@ -872,22 +872,22 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /app/models/webauthn_registration.rb @gitlab-org/manage/authentication-and-authorization
 /app/policies/personal_access_token_policy.rb @gitlab-org/manage/authentication-and-authorization
 /app/services/access_token_validation_service.rb @gitlab-org/manage/authentication-and-authorization
-/app/services/auth @gitlab-org/manage/authentication-and-authorization
-/app/services/authorized_project_update @gitlab-org/manage/authentication-and-authorization
+/app/services/auth/ @gitlab-org/manage/authentication-and-authorization
+/app/services/authorized_project_update/ @gitlab-org/manage/authentication-and-authorization
 /app/services/chat_names/authorize_user_service.rb @gitlab-org/manage/authentication-and-authorization
-/app/services/personal_access_tokens @gitlab-org/manage/authentication-and-authorization
+/app/services/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/services/projects/move_project_authorizations_service.rb @gitlab-org/manage/authentication-and-authorization
-/app/services/resource_access_tokens @gitlab-org/manage/authentication-and-authorization
+/app/services/resource_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/services/todos/destroy/unauthorized_features_service.rb @gitlab-org/manage/authentication-and-authorization
 /app/services/users/authorized_build_service.rb @gitlab-org/manage/authentication-and-authorization
 /app/services/users/authorized_create_service.rb @gitlab-org/manage/authentication-and-authorization
 /app/services/users/refresh_authorized_projects_service.rb @gitlab-org/manage/authentication-and-authorization
-/app/services/webauthn @gitlab-org/manage/authentication-and-authorization
+/app/services/webauthn/ @gitlab-org/manage/authentication-and-authorization
 /app/validators/json_schemas/cluster_agent_authorization_configuration.json @gitlab-org/manage/authentication-and-authorization
 /app/views/admin/application_settings/_external_authorization_service_form.html.haml @gitlab-org/manage/authentication-and-authorization
-/app/views/admin/impersonation_tokens @gitlab-org/manage/authentication-and-authorization
-/app/views/authentication @gitlab-org/manage/authentication-and-authorization
-/app/views/ci/token_access @gitlab-org/manage/authentication-and-authorization
+/app/views/admin/impersonation_tokens/ @gitlab-org/manage/authentication-and-authorization
+/app/views/authentication/ @gitlab-org/manage/authentication-and-authorization
+/app/views/ci/token_access/ @gitlab-org/manage/authentication-and-authorization
 /app/views/dashboard/projects/_zero_authorized_projects.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/devise/mailer/password_change.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/devise/mailer/password_change.text.erb @gitlab-org/manage/authentication-and-authorization
@@ -895,17 +895,17 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /app/views/devise/mailer/password_change_by_admin.text.erb @gitlab-org/manage/authentication-and-authorization
 /app/views/devise/mailer/reset_password_instructions.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/devise/mailer/reset_password_instructions.text.erb @gitlab-org/manage/authentication-and-authorization
-/app/views/devise/passwords @gitlab-org/manage/authentication-and-authorization
+/app/views/devise/passwords/ @gitlab-org/manage/authentication-and-authorization
 /app/views/devise/shared/_omniauth_box.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/devise/shared/_signup_omniauth_provider_list.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/devise/shared/_signup_omniauth_providers.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/devise/shared/_signup_omniauth_providers_top.haml @gitlab-org/manage/authentication-and-authorization
-/app/views/doorkeeper/authorizations @gitlab-org/manage/authentication-and-authorization
-/app/views/doorkeeper/authorized_applications @gitlab-org/manage/authentication-and-authorization
+/app/views/doorkeeper/authorizations/ @gitlab-org/manage/authentication-and-authorization
+/app/views/doorkeeper/authorized_applications/ @gitlab-org/manage/authentication-and-authorization
 /app/views/errors/omniauth_error.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/groups/settings/_resource_access_token_creation.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/groups/settings/_two_factor_auth.html.haml @gitlab-org/manage/authentication-and-authorization
-/app/views/groups/settings/access_tokens @gitlab-org/manage/authentication-and-authorization
+/app/views/groups/settings/access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/views/layouts/oauth_error.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/notify/access_token_about_to_expire_email.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/notify/access_token_about_to_expire_email.text.erb @gitlab-org/manage/authentication-and-authorization
@@ -913,20 +913,20 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /app/views/notify/access_token_created_email.text.erb @gitlab-org/manage/authentication-and-authorization
 /app/views/notify/access_token_expired_email.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/notify/access_token_expired_email.text.erb @gitlab-org/manage/authentication-and-authorization
-/app/views/profiles/passwords @gitlab-org/manage/authentication-and-authorization
-/app/views/profiles/personal_access_tokens @gitlab-org/manage/authentication-and-authorization
-/app/views/profiles/two_factor_auths @gitlab-org/manage/authentication-and-authorization
+/app/views/profiles/passwords/ @gitlab-org/manage/authentication-and-authorization
+/app/views/profiles/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/app/views/profiles/two_factor_auths/ @gitlab-org/manage/authentication-and-authorization
 /app/views/projects/mirrors/_authentication_method.html.haml @gitlab-org/manage/authentication-and-authorization
-/app/views/projects/settings/access_tokens @gitlab-org/manage/authentication-and-authorization
+/app/views/projects/settings/access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/views/shared/_no_password.html.haml @gitlab-org/manage/authentication-and-authorization
 /app/views/shared/_two_factor_auth_recovery_settings_check.html.haml @gitlab-org/manage/authentication-and-authorization
-/app/views/shared/access_tokens @gitlab-org/manage/authentication-and-authorization
+/app/views/shared/access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/views/shared/members/_two_factor_auth_badge.html.haml @gitlab-org/manage/authentication-and-authorization
-/app/views/shared/tokens @gitlab-org/manage/authentication-and-authorization
+/app/views/shared/tokens/ @gitlab-org/manage/authentication-and-authorization
 /app/workers/authorized_keys_worker.rb @gitlab-org/manage/authentication-and-authorization
-/app/workers/authorized_project_update @gitlab-org/manage/authentication-and-authorization
+/app/workers/authorized_project_update/ @gitlab-org/manage/authentication-and-authorization
 /app/workers/authorized_projects_worker.rb @gitlab-org/manage/authentication-and-authorization
-/app/workers/personal_access_tokens @gitlab-org/manage/authentication-and-authorization
+/app/workers/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/application_settings_tokens_optional_encryption.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/enforce_auth_checks_on_uploads.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/forti_authenticator.yml @gitlab-org/manage/authentication-and-authorization
@@ -936,6 +936,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /config/feature_flags/development/omniauth_login_minimal_scopes.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/personal_access_tokens_scoped_to_projects.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/projects_tokens_optional_encryption.yml @gitlab-org/manage/authentication-and-authorization
+/config/feature_flags/development/refresh_authorizations_via_affected_projects_on_group_membership.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/webauthn.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/ops/block_password_auth_for_saml_users.yml @gitlab-org/manage/authentication-and-authorization
@@ -949,27 +950,27 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /config/initializers/webauthn.rb @gitlab-org/manage/authentication-and-authorization
 /config/initializers_before_autoloader/100_patch_omniauth_oauth2.rb @gitlab-org/manage/authentication-and-authorization
 /config/initializers_before_autoloader/100_patch_omniauth_saml.rb @gitlab-org/manage/authentication-and-authorization
-/ee/app/assets/javascripts/access_tokens @gitlab-org/manage/authentication-and-authorization
-/ee/app/assets/javascripts/audit_events/components/tokens @gitlab-org/manage/authentication-and-authorization
+/ee/app/assets/javascripts/access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/assets/javascripts/audit_events/components/tokens/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/assets/javascripts/audit_events/token_utils.js @gitlab-org/manage/authentication-and-authorization
-/ee/app/assets/javascripts/groups/settings/components @gitlab-org/manage/authentication-and-authorization
-/ee/app/assets/javascripts/pages/groups/omniauth_callbacks @gitlab-org/manage/authentication-and-authorization
-/ee/app/assets/javascripts/pipelines/components/pipelines_list @gitlab-org/manage/authentication-and-authorization
-/ee/app/assets/javascripts/requirements/components/tokens @gitlab-org/manage/authentication-and-authorization
+/ee/app/assets/javascripts/groups/settings/components/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/assets/javascripts/pages/groups/omniauth_callbacks/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/assets/javascripts/pipelines/components/pipelines_list/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/assets/javascripts/requirements/components/tokens/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/assets/javascripts/saml_providers/scim_token_service.js @gitlab-org/manage/authentication-and-authorization
-/ee/app/assets/javascripts/saml_sso/components @gitlab-org/manage/authentication-and-authorization
+/ee/app/assets/javascripts/saml_sso/components/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_auth.vue @gitlab-org/manage/authentication-and-authorization
 /ee/app/controllers/concerns/ee/authenticates_with_two_factor.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/controllers/concerns/ee/enforces_two_factor_authentication.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/controllers/concerns/saml_authorization.rb @gitlab-org/manage/authentication-and-authorization
-/ee/app/controllers/ee/ldap @gitlab-org/manage/authentication-and-authorization
+/ee/app/controllers/ee/ldap/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/controllers/ee/omniauth_callbacks_controller.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/controllers/ee/passwords_controller.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/controllers/groups/omniauth_callbacks_controller.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/controllers/groups/scim_oauth_controller.rb @gitlab-org/manage/authentication-and-authorization
-/ee/app/controllers/oauth @gitlab-org/manage/authentication-and-authorization
+/ee/app/controllers/oauth/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/controllers/omniauth_kerberos_spnego_controller.rb @gitlab-org/manage/authentication-and-authorization
-/ee/app/finders/auth @gitlab-org/manage/authentication-and-authorization
+/ee/app/finders/auth/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/helpers/ee/access_tokens_helper.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/helpers/ee/auth_helper.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/helpers/ee/personal_access_tokens_helper.rb @gitlab-org/manage/authentication-and-authorization
@@ -977,10 +978,10 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /ee/app/models/ee/project_authorization.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/models/scim_oauth_access_token.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/serializers/scim_oauth_access_token_entity.rb @gitlab-org/manage/authentication-and-authorization
-/ee/app/services/ee/auth @gitlab-org/manage/authentication-and-authorization
-/ee/app/services/ee/personal_access_tokens @gitlab-org/manage/authentication-and-authorization
-/ee/app/services/ee/resource_access_tokens @gitlab-org/manage/authentication-and-authorization
-/ee/app/services/personal_access_tokens @gitlab-org/manage/authentication-and-authorization
+/ee/app/services/ee/auth/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/services/ee/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/services/ee/resource_access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/services/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/services/security/token_revocation_service.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/credentials_inventory_mailer/personal_access_token_revoked_email.html.haml @gitlab-org/manage/authentication-and-authorization
@@ -989,22 +990,21 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /ee/app/views/groups/sso/_authorize_pane.html.haml @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/notify/policy_revoked_personal_access_tokens_email.html.haml @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/notify/policy_revoked_personal_access_tokens_email.text.erb @gitlab-org/manage/authentication-and-authorization
-/ee/app/views/oauth @gitlab-org/manage/authentication-and-authorization
+/ee/app/views/oauth/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/shared/credentials_inventory/_personal_access_tokens.html.haml @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/shared/credentials_inventory/_project_access_tokens.html.haml @gitlab-org/manage/authentication-and-authorization
-/ee/app/views/shared/credentials_inventory/personal_access_tokens @gitlab-org/manage/authentication-and-authorization
-/ee/app/views/shared/credentials_inventory/project_access_tokens @gitlab-org/manage/authentication-and-authorization
-/ee/app/workers/personal_access_tokens @gitlab-org/manage/authentication-and-authorization
+/ee/app/views/shared/credentials_inventory/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/views/shared/credentials_inventory/project_access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/workers/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /ee/config/routes/oauth.rb @gitlab-org/manage/authentication-and-authorization
-/ee/lib/ee/gitlab/auth @gitlab-org/manage/authentication-and-authorization
-/ee/lib/ee/gitlab/auth.rb @gitlab-org/manage/authentication-and-authorization
+/ee/lib/ee/gitlab/auth/ @gitlab-org/manage/authentication-and-authorization
 /ee/lib/ee/gitlab/omniauth_initializer.rb @gitlab-org/manage/authentication-and-authorization
-/ee/lib/gitlab/auth @gitlab-org/manage/authentication-and-authorization
+/ee/lib/gitlab/auth/ @gitlab-org/manage/authentication-and-authorization
 /ee/lib/gitlab/auth_logger.rb @gitlab-org/manage/authentication-and-authorization
 /ee/lib/gitlab/authority_analyzer.rb @gitlab-org/manage/authentication-and-authorization
-/ee/lib/gitlab/geo/oauth @gitlab-org/manage/authentication-and-authorization
-/ee/lib/gitlab/kerberos @gitlab-org/manage/authentication-and-authorization
-/ee/lib/omni_auth @gitlab-org/manage/authentication-and-authorization
+/ee/lib/gitlab/geo/oauth/ @gitlab-org/manage/authentication-and-authorization
+/ee/lib/gitlab/kerberos/ @gitlab-org/manage/authentication-and-authorization
+/ee/lib/omni_auth/ @gitlab-org/manage/authentication-and-authorization
 /ee/lib/system_check/geo/authorized_keys_check.rb @gitlab-org/manage/authentication-and-authorization
 /ee/lib/system_check/geo/authorized_keys_flag_check.rb @gitlab-org/manage/authentication-and-authorization
 /lib/api/entities/ci/reset_token_result.rb @gitlab-org/manage/authentication-and-authorization
@@ -1019,27 +1019,28 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /lib/api/personal_access_tokens.rb @gitlab-org/manage/authentication-and-authorization
 /lib/api/resource_access_tokens.rb @gitlab-org/manage/authentication-and-authorization
 /lib/api/support/token_with_expiration.rb @gitlab-org/manage/authentication-and-authorization
-/lib/gitlab/api_authentication @gitlab-org/manage/authentication-and-authorization
-/lib/gitlab/auth @gitlab-org/manage/authentication-and-authorization
+/lib/gitlab/api_authentication/ @gitlab-org/manage/authentication-and-authorization
+/lib/gitlab/auth/ @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/auth.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/auth_logger.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/authorized_keys.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/background_migration/encrypt_static_object_token.rb @gitlab-org/manage/authentication-and-authorization
+/lib/gitlab/background_migration/expire_o_auth_tokens.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/background_migration/migrate_u2f_webauthn.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/background_migration/update_users_where_two_factor_auth_required_from_group.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/chat_name_token.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/ci/pipeline/expression/token.rb @gitlab-org/manage/authentication-and-authorization
-/lib/gitlab/external_authorization @gitlab-org/manage/authentication-and-authorization
+/lib/gitlab/external_authorization/ @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/external_authorization.rb @gitlab-org/manage/authentication-and-authorization
-/lib/gitlab/graphql/authorize @gitlab-org/manage/authentication-and-authorization
+/lib/gitlab/graphql/authorize/ @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/jwt_authenticatable.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/jwt_token.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/lfs_token.rb @gitlab-org/manage/authentication-and-authorization
-/lib/gitlab/mail_room @gitlab-org/manage/authentication-and-authorization
+/lib/gitlab/mail_room/ @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/omniauth_initializer.rb @gitlab-org/manage/authentication-and-authorization
 /lib/gitlab/project_authorizations.rb @gitlab-org/manage/authentication-and-authorization
-/lib/json_web_token @gitlab-org/manage/authentication-and-authorization
-/lib/omni_auth @gitlab-org/manage/authentication-and-authorization
+/lib/json_web_token/ @gitlab-org/manage/authentication-and-authorization
+/lib/omni_auth/ @gitlab-org/manage/authentication-and-authorization
 /lib/system_check/app/authorized_keys_permission_check.rb @gitlab-org/manage/authentication-and-authorization
 /lib/system_check/incoming_email/imap_authentication_check.rb @gitlab-org/manage/authentication-and-authorization
 /lib/tasks/gitlab/password.rake @gitlab-org/manage/authentication-and-authorization

.gitpod.yml

@@ -11,10 +11,8 @@ tasks:
       (
         set -e
         cd /workspace/gitlab-development-kit
-        # GitLab FOSS
-        [[ -d /workspace/gitlab-foss ]] && ln -fs /workspace/gitlab-foss /workspace/gitlab-development-kit/gitlab
-        # GitLab
-        [[ -d /workspace/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
+        # Ensure GitLab directory is symlinked under the GDK
+        ln -nfs "$GITPOD_REPO_ROOT" /workspace/gitlab-development-kit/gitlab
         mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
         # ensure gdk.yml has correct instance settings
         gdk config set gitlab.rails.port 443

.rubocop_todo/gitlab/namespaced_class.yml

@@ -1089,7 +1089,6 @@ Gitlab/NamespacedClass:
     - 'ee/app/workers/project_import_schedule_worker.rb'
     - 'ee/app/workers/project_template_export_worker.rb'
     - 'ee/app/workers/refresh_license_compliance_checks_worker.rb'
-    - 'ee/app/workers/repository_push_audit_event_worker.rb'
     - 'ee/app/workers/repository_update_mirror_worker.rb'
     - 'ee/app/workers/scan_security_report_secrets_worker.rb'
     - 'ee/app/workers/set_user_status_based_on_user_cap_setting_worker.rb'

.rubocop_todo/style/symbol_proc.yml

@@ -113,7 +113,6 @@ Style/SymbolProc:
     - 'ee/app/workers/geo/batch/project_registry_worker.rb'
     - 'ee/app/workers/geo/sync_timeout_cron_worker.rb'
     - 'ee/app/workers/geo/verification_cron_worker.rb'
-    - 'ee/app/workers/repository_push_audit_event_worker.rb'
     - 'ee/lib/api/entities/pending_member.rb'
     - 'ee/lib/api/related_epic_links.rb'
     - 'ee/lib/ee/api/entities/audit_event.rb'

GITALY_SERVER_VERSION

-ac989862106589558866e01fc5d77ad7326c99e4
+a6c5964bb455f77a0c79898f0b99c4c7df3aee3a

app/assets/javascripts/ci_secure_files/components/secure_files_list.vue

@@ -191,7 +191,7 @@ export default {
 
       <div class="col-md-12 col-lg-6">
         <div class="gl-display-flex gl-flex-wrap gl-justify-content-end">
-          <gl-button v-if="admin" class="gl-mt-3" variant="info" @click="loadFileSelctor">
+          <gl-button v-if="admin" class="gl-mt-3" variant="confirm" @click="loadFileSelctor">
             <span v-if="uploading">
               <gl-loading-icon size="sm" class="gl-my-5" inline />
               {{ $options.i18n.uploadingLabel }}

app/assets/javascripts/content_editor/services/hast_to_prosemirror_converter.js

@@ -63,10 +63,12 @@ function maybeMerge(a, b) {
 function createSourceMapAttributes(hastNode, source) {
   const { position } = hastNode;
 
-  return {
-    sourceMapKey: `${position.start.offset}:${position.end.offset}`,
-    sourceMarkdown: source.substring(position.start.offset, position.end.offset),
-  };
+  return position.end
+    ? {
+        sourceMapKey: `${position.start.offset}:${position.end.offset}`,
+        sourceMarkdown: source.substring(position.start.offset, position.end.offset),
+      }
+    : {};
 }
 
 /**
@@ -252,11 +254,19 @@ const createProseMirrorNodeFactories = (schema, proseMirrorFactorySpecs, source)
   const factories = {
     root: {
       selector: 'root',
-      handle: (state, hastNode) => state.openNode(schema.topNodeType, hastNode, {}),
+      handle: (state, hastNode) =>
+        state.openNode(
+          schema.topNodeType,
+          hastNode,
+          {},
+          {
+            wrapTextInParagraph: true,
+          },
+        ),
     },
     text: {
       selector: 'text',
-      handle: (state, hastNode) => {
+      handle: (state, hastNode, parent) => {
         const { factorySpec } = state.top;
 
         if (/^\s+$/.test(hastNode.value)) {
@@ -264,7 +274,7 @@ const createProseMirrorNodeFactories = (schema, proseMirrorFactorySpecs, source)
         }
 
         if (factorySpec.wrapTextInParagraph === true) {
-          state.openNode(schema.nodeType('paragraph'));
+          state.openNode(schema.nodeType('paragraph'), hastNode, getAttrs({}, parent, [], source));
           state.addText(schema, hastNode.value);
           state.closeNode();
         } else {

app/assets/javascripts/filtered_search/filtered_search_token_keys.js

-import { __ } from '~/locale';
-
 export default class FilteredSearchTokenKeys {
   constructor(tokenKeys = [], alternativeTokenKeys = [], conditions = []) {
     this.tokenKeys = tokenKeys;
@@ -76,24 +74,6 @@ export default class FilteredSearchTokenKeys {
     );
   }
 
-  addExtraTokensForIssues() {
-    const confidentialToken = {
-      formattedKey: __('Confidential'),
-      key: 'confidential',
-      type: 'string',
-      param: '',
-      symbol: '',
-      icon: 'eye-slash',
-      tag: __('Yes or No'),
-      lowercaseValueOnSubmit: true,
-      uppercaseTokenName: false,
-      capitalizeTokenValue: true,
-    };
-
-    this.tokenKeys.push(confidentialToken);
-    this.tokenKeysWithAlternative.push(confidentialToken);
-  }
-
   removeTokensForKeys(...keys) {
     const keysSet = new Set(keys);
 

app/assets/javascripts/google_cloud/components/revoke_oauth.vue

@@ -30,7 +30,7 @@ export default {
     <p>{{ $options.i18n.description }}</p>
     <gl-form :action="url" method="post">
       <input :value="$options.csrf.token" type="hidden" name="authenticity_token" />
-      <gl-button category="secondary" variant="warning" type="submit">
+      <gl-button category="secondary" variant="danger" type="submit">
         {{ $options.i18n.title }}
       </gl-button>
     </gl-form>

app/assets/javascripts/graphql_shared/possible_types.json

@@ -129,5 +129,8 @@
     "VulnerabilityLocationGeneric",
     "VulnerabilityLocationSast",
     "VulnerabilityLocationSecretDetection"
+  ],
+  "WorkItemWidget": [
+    "WorkItemWidgetDescription"
   ]
 }

app/assets/javascripts/issuable/components/issuable_header_warnings.vue

@@ -27,7 +27,7 @@ export default {
       return this.getNoteableData.confidential;
     },
     isMergeRequest() {
-      return this.getNoteableData.targetType === 'merge_request' && this.glFeatures.updatedMrHeader;
+      return this.getNoteableData.targetType === 'merge_request';
     },
     warningIconsMeta() {
       return [

app/assets/javascripts/issuable/components/status_box.vue

@@ -74,8 +74,7 @@ export default {
       return [
         CLASSES[this.state],
         {
-          'gl-vertical-align-bottom':
-            this.issuableType === IssuableType.MergeRequest && this.glFeatures.updatedMrHeader,
+          'gl-vertical-align-bottom': this.issuableType === IssuableType.MergeRequest,
         },
       ];
     },

app/assets/javascripts/merge_request.js

@@ -156,11 +156,7 @@ MergeRequest.toggleDraftStatus = function (title, isReady) {
   } else {
     toast(__('Marked as draft. Can only be merged when marked as ready.'));
   }
-  const titleEl = document.querySelector(
-    `.merge-request .detail-page-${
-      window.gon?.features?.updatedMrHeader ? 'header' : 'description'
-    } .title`,
-  );
+  const titleEl = document.querySelector(`.merge-request .detail-page-header .title`);
 
   if (titleEl) {
     titleEl.textContent = title;

app/assets/javascripts/packages_and_registries/shared/components/cli_commands.vue

@@ -49,7 +49,7 @@ export default {
 <template>
   <gl-dropdown
     :text="$options.i18n.QUICK_START"
-    variant="info"
+    variant="confirm"
     right
     @shown="track('click_dropdown')"
   >

app/assets/javascripts/pages/groups/issues/index.js

-import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
-import { initBulkUpdateSidebar } from '~/issuable/bulk_update_sidebar';
 import { mountIssuesListApp } from '~/issues/list';
-import initManualOrdering from '~/issues/manual_ordering';
-import { FILTERED_SEARCH } from '~/filtered_search/constants';
-import initFilteredSearch from '~/pages/search/init_filtered_search';
-import projectSelect from '~/project_select';
 
-if (gon.features?.vueIssuesList) {
-  mountIssuesListApp();
-} else {
-  const ISSUE_BULK_UPDATE_PREFIX = 'issue_';
-
-  IssuableFilteredSearchTokenKeys.addExtraTokensForIssues();
-  IssuableFilteredSearchTokenKeys.removeTokensForKeys('release');
-  initBulkUpdateSidebar(ISSUE_BULK_UPDATE_PREFIX);
-
-  initFilteredSearch({
-    page: FILTERED_SEARCH.ISSUES,
-    isGroupDecendent: true,
-    useDefaultState: true,
-    filteredSearchTokenKeys: IssuableFilteredSearchTokenKeys,
-  });
-  projectSelect();
-  initManualOrdering();
-}
+mountIssuesListApp();

app/assets/javascripts/pages/projects/issues/index/index.js

-import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
 import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
-import { initCsvImportExportButtons, initIssuableByEmail } from '~/issuable';
-import { initBulkUpdateSidebar, initIssueStatusSelect } from '~/issuable/bulk_update_sidebar';
 import { mountIssuesListApp, mountJiraIssuesListApp } from '~/issues/list';
-import initManualOrdering from '~/issues/manual_ordering';
-import { FILTERED_SEARCH } from '~/filtered_search/constants';
-import { ISSUABLE_INDEX } from '~/issuable/constants';
-import initFilteredSearch from '~/pages/search/init_filtered_search';
-import UsersSelect from '~/users_select';
-
-if (gon.features?.vueIssuesList) {
-  mountIssuesListApp();
-} else {
-  IssuableFilteredSearchTokenKeys.addExtraTokensForIssues();
-
-  initFilteredSearch({
-    page: FILTERED_SEARCH.ISSUES,
-    filteredSearchTokenKeys: IssuableFilteredSearchTokenKeys,
-    useDefaultState: true,
-  });
-
-  initBulkUpdateSidebar(ISSUABLE_INDEX.ISSUE);
-  initIssueStatusSelect();
-  new UsersSelect(); // eslint-disable-line no-new
-
-  initCsvImportExportButtons();
-  initIssuableByEmail();
-  initManualOrdering();
-}
-
-new ShortcutsNavigation(); // eslint-disable-line no-new
 
+mountIssuesListApp();
 mountJiraIssuesListApp();
+new ShortcutsNavigation(); // eslint-disable-line no-new

app/assets/javascripts/projects/project_visibility.js

-import $ from 'jquery';
 import { escape } from 'lodash';
 import { __, sprintf } from '~/locale';
 import eventHub from '~/projects/new/event_hub';
@@ -63,9 +62,8 @@ export default function initProjectVisibilitySelector() {
 
   const namespaceSelector = document.querySelector('select.js-select-namespace');
   if (namespaceSelector) {
-    $('.select2.js-select-namespace').on('change', () =>
-      handleSelect2DropdownChange(namespaceSelector),
-    );
+    const el = document.querySelector('.select2.js-select-namespace');
+    el.addEventListener('change', () => handleSelect2DropdownChange(namespaceSelector));
     handleSelect2DropdownChange(namespaceSelector);
   }
 }

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue

-<script>
-import {
-  GlLink,
-  GlTooltipDirective,
-  GlModalDirective,
-  GlSafeHtmlDirective as SafeHtml,
-  GlSprintf,
-} from '@gitlab/ui';
-import { constructWebIDEPath } from '~/lib/utils/url_utility';
-import { s__ } from '~/locale';
-import clipboardButton from '~/vue_shared/components/clipboard_button.vue';
-import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
-import MrWidgetIcon from './mr_widget_icon.vue';
-
-export default {
-  name: 'MRWidgetHeader',
-  components: {
-    clipboardButton,
-    TooltipOnTruncate,
-    MrWidgetIcon,
-    GlLink,
-    GlSprintf,
-  },
-  directives: {
-    GlTooltip: GlTooltipDirective,
-    GlModalDirective,
-    SafeHtml,
-  },
-  props: {
-    mr: {
-      type: Object,
-      required: true,
-    },
-  },
-  computed: {
-    shouldShowCommitsBehindText() {
-      return this.mr.divergedCommitsCount > 0;
-    },
-    branchNameClipboardData() {
-      // This supports code in app/assets/javascripts/copy_to_clipboard.js that
-      // works around ClipboardJS limitations to allow the context-specific
-      // copy/pasting of plain text or GFM.
-      return JSON.stringify({
-        text: this.mr.sourceBranch,
-        gfm: `\`${this.mr.sourceBranch}\``,
-      });
-    },
-    webIdePath() {
-      return constructWebIDEPath(this.mr);
-    },
-    isFork() {
-      return this.mr.sourceProjectFullPath !== this.mr.targetProjectFullPath;
-    },
-  },
-  i18n: {
-    webIdeText: s__('mrWidget|Open in Web IDE'),
-    gitpodText: s__('mrWidget|Open in Gitpod'),
-  },
-};
-</script>
-<template>
-  <div class="gl-display-flex mr-source-target">
-    <mr-widget-icon name="git-merge" />
-    <div class="git-merge-container d-flex">
-      <div class="normal">
-        <strong>
-          {{ s__('mrWidget|Request to merge') }}
-          <tooltip-on-truncate
-            v-safe-html="mr.sourceBranchLink"
-            :title="mr.sourceBranch"
-            truncate-target="child"
-            class="label-branch label-truncate js-source-branch"
-          /><clipboard-button
-            data-testid="mr-widget-copy-clipboard"
-            :text="branchNameClipboardData"
-            :title="__('Copy branch name')"
-            category="tertiary"
-          />
-          {{ s__('mrWidget|into') }}
-          <tooltip-on-truncate
-            :title="mr.targetBranch"
-            truncate-target="child"
-            class="label-branch label-truncate"
-          >
-            <a :href="mr.targetBranchTreePath" class="js-target-branch"> {{ mr.targetBranch }} </a>
-          </tooltip-on-truncate>
-        </strong>
-        <div v-if="shouldShowCommitsBehindText" class="diverged-commits-count">
-          <gl-sprintf :message="s__('mrWidget|The source branch is %{link} the target branch')">
-            <template #link>
-              <gl-link :href="mr.targetBranchPath">{{
-                n__('%d commit behind', '%d commits behind', mr.divergedCommitsCount)
-              }}</gl-link>
-            </template>
-          </gl-sprintf>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue

@@ -93,9 +93,7 @@ export default {
       </span>
     </p>
     <div
-      v-if="
-        divergedCommitsCount > 0 && glFeatures.updatedMrHeader && !glFeatures.restructuredMrWidget
-      "
+      v-if="divergedCommitsCount > 0 && !glFeatures.restructuredMrWidget"
       class="diverged-commits-count"
     >
       <gl-sprintf :message="s__('mrWidget|The source branch is %{link} the target branch')">

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue

@@ -113,7 +113,7 @@ export default {
             data-testid="ok"
             category="primary"
             class="gl-mt-2"
-            variant="info"
+            variant="confirm"
             :href="pipelinePath"
             :data-track-property="humanAccess"
             :data-track-value="$options.SP_SHOW_TRACK_VALUE"