Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 4 deletions

diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index e7ac27c5e3e..bd5945a951b 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -172,9 +172,6 @@ export default {
     trackingLabel() {
       return slugifyWithUnderscore(`${this.commentButtonTitle} button`);
     },
-    internalNotesEnabled() {
-      return Boolean(this.glFeatures.confidentialNotes);
-    },
     disableSubmitButton() {
       return this.note.length === 0 || this.isSubmitting;
     },
@@ -414,7 +411,7 @@ export default {
               </template>
               <template v-else>
                 <gl-form-checkbox
-                  v-if="internalNotesEnabled && canSetInternalNote"
+                  v-if="canSetInternalNote"
                   v-model="noteIsInternal"
                   class="gl-mb-2"
                   data-testid="internal-note-checkbox"