Skip to content
Snippets Groups Projects
Unverified Commit 11b4d14e authored by Phil Hughes's avatar Phil Hughes Committed by GitLab
Browse files

Merge branch 'assign-approver' into 'master'

De-emphasize required approvals in sidebar

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168428



Merged-by: Phil Hughes's avatarPhil Hughes <me@iamphill.com>
Approved-by: default avatarMichael Le <mle@gitlab.com>
Approved-by: Phil Hughes's avatarPhil Hughes <me@iamphill.com>
Co-authored-by: default avatarAnnabel Dunstone Gray <annabel.dunstone@gmail.com>
parents 86d4ed19 a5934d21
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -215,7 +215,7 @@ export default {
size="small"
category="tertiary"
variant="confirm"
class="gl-ml-3"
class="gl-ml-2 !gl-text-sm"
@click="toggleDrawerOpen()"
>
{{ __('Assign') }}
Loading
Loading
Loading
Loading
@@ -114,7 +114,7 @@ export default {
<div class="gl-flex gl-items-center">
<div v-if="isLoading" class="gl-animate-skeleton-loader gl-h-4 gl-w-full gl-rounded-base"></div>
<template v-else-if="mergeRequest && multipleApprovalRulesAvailable">
<p :class="{ 'text-muted': approvalsOptional }" class="gl-mb-0 gl-inline-block">
<p class="gl-mb-0 gl-inline-block gl-text-sm gl-text-subtle">
{{ approvalsLeftMessage }}
</p>
<slot></slot>
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment