diff options
Diffstat (limited to 'app/assets/javascripts/sidebar/components/reviewers')
3 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue index 45707c18f7b..10b16a44261 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue @@ -97,11 +97,12 @@ export default { <collapsed-reviewer v-for="user in collapsedUsers" :key="user.id" :user="user" /> <button v-if="hasMoreThanTwoReviewers" class="btn-link" type="button"> <span class="avatar-counter sidebar-avatar-counter"> {{ sidebarAvatarCounter }} </span> - <i + <gl-icon v-if="!allReviewersCanMerge" + name="warning-solid" aria-hidden="true" - class="fa fa-exclamation-triangle merge-icon" - ></i> + class="merge-icon" + /> </button> </div> </template> diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue index 9fa3fa38eac..7961b7cd679 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue @@ -1,9 +1,13 @@ <script> // NOTE! For the first iteration, we are simply copying the implementation of Assignees // It will soon be overhauled in Issue https://gitlab.com/gitlab-org/gitlab/-/issues/233736 +import { GlIcon } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; export default { + components: { + GlIcon, + }, props: { user: { type: Object, @@ -38,6 +42,6 @@ export default { class="avatar avatar-inline m-0" data-qa-selector="avatar_image" /> - <i v-if="hasMergeIcon" aria-hidden="true" class="fa fa-exclamation-triangle merge-icon"></i> + <gl-icon v-if="hasMergeIcon" name="warning-solid" aria-hidden="true" class="merge-icon" /> </span> </template> diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue index 4f4f7002dc9..d64b483acb1 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue @@ -59,7 +59,7 @@ export default { href="#" role="button" > - <gl-icon aria-hidden="true" data-hidden="true" name="chevron-double-lg-right" :size="12" /> + <gl-icon data-hidden="true" name="chevron-double-lg-right" :size="12" /> </a> </div> </template> |