From 0ea3fcec397b69815975647f5e2aa5fe944a8486 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Jun 2022 11:10:13 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-1-stable-ee

---
 app/assets/javascripts/notes/components/note_header.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'app/assets/javascripts/notes/components/note_header.vue')

diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue
index 1ad9d593ccc..9917249f0db 100644
--- a/app/assets/javascripts/notes/components/note_header.vue
+++ b/app/assets/javascripts/notes/components/note_header.vue
@@ -67,7 +67,7 @@ export default {
       required: false,
       default: true,
     },
-    isConfidential: {
+    isInternalNote: {
       type: Boolean,
       required: false,
       default: false,
@@ -110,7 +110,7 @@ export default {
     authorName() {
       return this.author.name;
     },
-    noteConfidentialityTooltip() {
+    internalNoteTooltip() {
       return s__('Notes|This internal note will always remain confidential');
     },
   },
@@ -231,12 +231,13 @@ export default {
         <time-ago-tooltip v-else ref="noteTimestamp" :time="createdAt" tooltip-placement="bottom" />
       </template>
       <gl-badge
-        v-if="isConfidential"
+        v-if="isInternalNote"
         v-gl-tooltip:tooltipcontainer.bottom
         data-testid="internalNoteIndicator"
         variant="warning"
         size="sm"
-        :title="noteConfidentialityTooltip"
+        class="gl-mb-3 gl-ml-2"
+        :title="internalNoteTooltip"
       >
         {{ __('Internal note') }}
       </gl-badge>
-- 
cgit v1.2.1

