Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-16 18:08:39 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-16 18:08:39 +0300
commitd7b1354b396d2e579fd6fe3c18a28b6ffe934f09 (patch)
tree958e3dd6579165d790febba196d64d6ef8c86ea5 /app/assets/javascripts/notes
parent1c9afffa29584c92bf1bb73c005f69c6875808e6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r--app/assets/javascripts/notes/components/comment_form.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 02a815db09c..4e03bed8737 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -91,13 +91,13 @@ export default {
},
commentButtonTitle() {
const { comment, internalComment, startThread, startInternalThread } = this.$options.i18n;
- if (this.getNoteableData.confidential || this.noteIsConfidential) {
+ if (this.noteIsConfidential) {
return this.noteType === constants.COMMENT ? internalComment : startInternalThread;
}
return this.noteType === constants.COMMENT ? comment : startThread;
},
textareaPlaceholder() {
- return this.getNoteableData.confidential || this.noteIsConfidential
+ return this.noteIsConfidential
? this.$options.i18n.bodyPlaceholderInternal
: this.$options.i18n.bodyPlaceholder;
},