Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 1 deletions

diff --git a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue b/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
index 748d6082abd..57b19620c10 100644
--- a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
@@ -45,18 +45,31 @@ export default {
       required: false,
       default: false,
     },
+    internalNote: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     ...mapGetters(['getUserData']),
     renderedNote() {
       return renderMarkdown(this.note.body);
     },
+    internalNoteClass() {
+      return {
+        'internal-note': this.internalNote,
+      };
+    },
   },
 };
 </script>
 
 <template>
-  <timeline-entry-item class="note note-wrapper note-comment being-posted fade-in-half">
+  <timeline-entry-item
+    class="note note-wrapper note-comment being-posted fade-in-half"
+    :class="internalNoteClass"
+  >
     <div class="timeline-avatar gl-float-left">
       <gl-avatar-link :href="getUserData.path">
         <gl-avatar