diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/assets/javascripts/notes/components/note_header.vue | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
download | gitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/notes/components/note_header.vue')
-rw-r--r-- | app/assets/javascripts/notes/components/note_header.vue | 9 |
1 files changed, 5 insertions, 4 deletions
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> |