From a2dc68a56ecd9f6dfe95948b9d2ea244c6c1ffb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Caplette?= Date: Fri, 12 Dec 2025 16:53:30 -0500 Subject: [PATCH] Add disabled reviewer support for MR assignees and reviewers Implement the ability to disable reviewers based on the disabledReason field, similar to the work_item_assignees implementation. This prevents certain users from being assigned as reviewers while allowing already-assigned reviewers to be removed. Changes: - Update GraphQL query to include compositeIdentityEnforced field - Add disabled user filtering in reviewer dropdown - Display disabledReason instead of username for disabled reviewers - Prevent disabled users from being selected in dropdown - Add visual styling for disabled reviewers - Update specs with disabled and status fields --- ...complete_users_with_mr_permissions.query.graphql | 1 + .../stylesheets/page_bundles/merge_requests.scss | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql b/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql index 8155451fb7cef4..854842839eb323 100644 --- a/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql +++ b/app/assets/javascripts/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql @@ -11,6 +11,7 @@ query projectAutocompleteUsersSearchWithMRPermissions( users: autocompleteUsers(search: $search) { ...User ...UserAvailability + compositeIdentityEnforced @gl_introduced(version: "18.7.0") mergeRequestInteraction(id: $mergeRequestId) { canMerge } diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index f7eb44bb6bbd7d..7295e52503455c 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -975,3 +975,16 @@ $diff-file-header-top: 11px; .merge-request-review-drawer .rte-text-box{ line-height: 1.5; } + +/* stylelint-disable-next-line gitlab/no-gl-class */ +.gl-new-dropdown-item:has(.sidebar-reviewer-disabled) { + cursor: not-allowed; +} + +.sidebar-reviewer-disabled { + /* stylelint-disable-next-line gitlab/no-gl-class */ + .gl-font-bold, + .gl-text-subtle { + color: var(--gl-text-color-disabled); + } +} -- GitLab