diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-16 15:07:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-16 15:07:51 +0300 |
| commit | 1c9afffa29584c92bf1bb73c005f69c6875808e6 (patch) | |
| tree | 39332df6f417a28296703e28bd7f5c9ab08275d6 /app/assets/javascripts/notes | |
| parent | f15ffb0170776275ff875ddc32bcd79d6c6163eb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_counter.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index 717ebcbe993..f746f7ed0ed 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -60,15 +60,15 @@ export default { <div class="gl-display-flex gl-align-items-center gl-pl-4 gl-rounded-base gl-mr-3" :class="{ - 'gl-bg-orange-50': blocksMerge, - 'gl-bg-gray-50': !blocksMerge, + 'gl-bg-orange-50': blocksMerge && !allResolved, + 'gl-bg-gray-50': !blocksMerge || allResolved, 'gl-pr-4': allResolved, 'gl-pr-2': !allResolved, }" data-testid="discussions-counter-text" > <template v-if="allResolved"> - {{ __('All threads resolved') }} + {{ __('All threads resolved!') }} </template> <template v-else> {{ n__('%d unresolved thread', '%d unresolved threads', unresolvedDiscussionsCount) }} |