Add latest changes from gitlab-org/gitlab@master

3 files changed, 47 insertions, 64 deletions

diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue
index cc74c2ee605..f1c41eea428 100644
--- a/app/assets/javascripts/notes/components/note_body.vue
+++ b/app/assets/javascripts/notes/components/note_body.vue
@@ -8,7 +8,6 @@ import { __ } from '~/locale';
 import '~/behaviors/markdown/render_gfm';
 import Suggestions from '~/vue_shared/components/markdown/suggestions.vue';
 import autosave from '../mixins/autosave';
-import { INTERNAL_NOTE_CLASSES } from '../constants';
 import noteAttachment from './note_attachment.vue';
 import noteAwardsList from './note_awards_list.vue';
 import noteEditedText from './note_edited_text.vue';
@@ -55,11 +54,6 @@ export default {
       required: false,
       default: '',
     },
-    isInternalNote: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   computed: {
     ...mapGetters(['getDiscussion', 'suggestionsCount', 'getSuggestionsFilePaths']),
@@ -101,12 +95,6 @@ export default {
 
       return escape(suggestion);
     },
-    internalNoteContainerClasses() {
-      if (this.isInternalNote && !this.isEditing) {
-        return INTERNAL_NOTE_CLASSES;
-      }
-      return '';
-    },
   },
   mounted() {
     this.renderGFM();
@@ -179,54 +167,52 @@ export default {
     }"
     class="note-body"
   >
-    <div :class="internalNoteContainerClasses" data-testid="note-internal-container">
-      <suggestions
-        v-if="hasSuggestion && !isEditing"
-        :suggestions="note.suggestions"
-        :suggestions-count="suggestionsCount"
-        :batch-suggestions-info="batchSuggestionsInfo"
-        :note-html="note.note_html"
-        :line-type="lineType"
-        :help-page-path="helpPagePath"
-        :default-commit-message="commitMessage"
-        :failed-to-load-metadata="failedToLoadMetadata"
-        @apply="applySuggestion"
-        @applyBatch="applySuggestionBatch"
-        @addToBatch="addSuggestionToBatch"
-        @removeFromBatch="removeSuggestionFromBatch"
-      />
-      <div v-else v-safe-html:[$options.safeHtmlConfig]="note.note_html" class="note-text md"></div>
-      <note-form
-        v-if="isEditing"
-        ref="noteForm"
-        :note-body="noteBody"
-        :note-id="note.id"
-        :line="line"
-        :note="note"
-        :save-button-title="saveButtonTitle"
-        :help-page-path="helpPagePath"
-        :discussion="discussion"
-        :resolve-discussion="note.resolve_discussion"
-        @handleFormUpdate="handleFormUpdate"
-        @cancelForm="formCancelHandler"
-      />
-      <!-- eslint-disable vue/no-mutating-props -->
-      <textarea
-        v-if="canEdit"
-        v-model="note.note"
-        :data-update-url="note.path"
-        class="hidden js-task-list-field"
-        dir="auto"
-      ></textarea>
-      <!-- eslint-enable vue/no-mutating-props -->
-      <note-edited-text
-        v-if="note.last_edited_at"
-        :edited-at="note.last_edited_at"
-        :edited-by="note.last_edited_by"
-        action-text="Edited"
-        class="note_edited_ago"
-      />
-    </div>
+    <suggestions
+      v-if="hasSuggestion && !isEditing"
+      :suggestions="note.suggestions"
+      :suggestions-count="suggestionsCount"
+      :batch-suggestions-info="batchSuggestionsInfo"
+      :note-html="note.note_html"
+      :line-type="lineType"
+      :help-page-path="helpPagePath"
+      :default-commit-message="commitMessage"
+      :failed-to-load-metadata="failedToLoadMetadata"
+      @apply="applySuggestion"
+      @applyBatch="applySuggestionBatch"
+      @addToBatch="addSuggestionToBatch"
+      @removeFromBatch="removeSuggestionFromBatch"
+    />
+    <div v-else v-safe-html:[$options.safeHtmlConfig]="note.note_html" class="note-text md"></div>
+    <note-form
+      v-if="isEditing"
+      ref="noteForm"
+      :note-body="noteBody"
+      :note-id="note.id"
+      :line="line"
+      :note="note"
+      :save-button-title="saveButtonTitle"
+      :help-page-path="helpPagePath"
+      :discussion="discussion"
+      :resolve-discussion="note.resolve_discussion"
+      @handleFormUpdate="handleFormUpdate"
+      @cancelForm="formCancelHandler"
+    />
+    <!-- eslint-disable vue/no-mutating-props -->
+    <textarea
+      v-if="canEdit"
+      v-model="note.note"
+      :data-update-url="note.path"
+      class="hidden js-task-list-field"
+      dir="auto"
+    ></textarea>
+    <!-- eslint-enable vue/no-mutating-props -->
+    <note-edited-text
+      v-if="note.last_edited_at"
+      :edited-at="note.last_edited_at"
+      :edited-by="note.last_edited_by"
+      action-text="Edited"
+      class="note_edited_ago"
+    />
     <note-awards-list
       v-if="note.award_emoji && note.award_emoji.length"
       :note-id="note.id"
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index 095ab5ddb0f..875cfff74fe 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -406,7 +406,7 @@ export default {
 <template>
   <timeline-entry-item
     :id="noteAnchorId"
-    :class="classNameBindings"
+    :class="{ ...classNameBindings, 'internal-note': note.confidential }"
     :data-award-url="note.toggle_award_path"
     :data-note-id="note.id"
     class="note note-wrapper"
@@ -506,7 +506,6 @@ export default {
           ref="noteBody"
           :note="note"
           :can-edit="note.current_user.can_edit"
-          :is-internal-note="note.confidential"
           :line="line"
           :file="diffFile"
           :is-editing="isEditing"
diff --git a/app/assets/javascripts/notes/constants.js b/app/assets/javascripts/notes/constants.js
index 3317f4e2383..a5f459c8910 100644
--- a/app/assets/javascripts/notes/constants.js
+++ b/app/assets/javascripts/notes/constants.js
@@ -51,5 +51,3 @@ export const toggleStateErrorMessage = {
     [REOPENED]: __('Something went wrong while closing the merge request. Please try again later.'),
   },
 };
-
-export const INTERNAL_NOTE_CLASSES = ['gl-bg-orange-50', 'gl-px-4', 'gl-py-2'];