Add latest changes from gitlab-org/gitlab@master

2 files changed, 47 insertions, 5 deletions

diff --git a/spec/frontend/work_items/components/notes/__snapshots__/work_item_note_body_spec.js.snap b/spec/frontend/work_items/components/notes/__snapshots__/work_item_note_body_spec.js.snap
index 52838dcd0bc..841b8b57f88 100644
--- a/spec/frontend/work_items/components/notes/__snapshots__/work_item_note_body_spec.js.snap
+++ b/spec/frontend/work_items/components/notes/__snapshots__/work_item_note_body_spec.js.snap
@@ -1,9 +1,41 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Work Item Note Body should have the wrapper to show the note body 1`] = `
-"<div data-testid=\\"work-item-note-body\\" class=\\"note-text md\\">
-  <p dir=\\"auto\\" data-sourcepos=\\"1:1-1:76\\">
-    <gl-emoji data-unicode-version=\\"6.0\\" data-name=\\"wave\\" title=\\"waving hand sign\\">👋</gl-emoji> Hi <a title=\\"Sherie Nitzsche\\" class=\\"gfm gfm-project_member js-user-link\\" data-placement=\\"top\\" data-container=\\"body\\" data-user=\\"3\\" data-reference-type=\\"user\\" href=\\"/fredda.brekke\\">@fredda.brekke</a> How are you ? what do you think about this ? <gl-emoji data-unicode-version=\\"6.0\\" data-name=\\"pray\\" title=\\"person with folded hands\\">🙏</gl-emoji>
+<div
+  class="md note-text"
+  data-testid="work-item-note-body"
+>
+  <p
+    data-sourcepos="1:1-1:76"
+    dir="auto"
+  >
+    <gl-emoji
+      data-name="wave"
+      data-unicode-version="6.0"
+      title="waving hand sign"
+    >
+      👋
+    </gl-emoji>
+    Hi
+    <a
+      class="gfm gfm-project_member js-user-link"
+      data-container="body"
+      data-placement="top"
+      data-reference-type="user"
+      data-user="3"
+      href="/fredda.brekke"
+      title="Sherie Nitzsche"
+    >
+      @fredda.brekke
+    </a>
+    How are you ? what do you think about this ?
+    <gl-emoji
+      data-name="pray"
+      data-unicode-version="6.0"
+      title="person with folded hands"
+    >
+      🙏
+    </gl-emoji>
   </p>
-</div>"
+</div>
 `;
diff --git a/spec/frontend/work_items/components/notes/__snapshots__/work_item_note_replying_spec.js.snap b/spec/frontend/work_items/components/notes/__snapshots__/work_item_note_replying_spec.js.snap
index 30577dc60cf..af930f56509 100644
--- a/spec/frontend/work_items/components/notes/__snapshots__/work_item_note_replying_spec.js.snap
+++ b/spec/frontend/work_items/components/notes/__snapshots__/work_item_note_replying_spec.js.snap
@@ -1,3 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Work Item Note Replying should have the note body and header 1`] = `"<note-header-stub author=\\"[object Object]\\" actiontext=\\"\\" noteabletype=\\"\\" expanded=\\"true\\" showspinner=\\"true\\" noteurl=\\"\\" emailparticipant=\\"\\"></note-header-stub>"`;
+exports[`Work Item Note Replying should have the note body and header 1`] = `
+<note-header-stub
+  actiontext=""
+  author="[object Object]"
+  emailparticipant=""
+  expanded="true"
+  noteabletype=""
+  noteurl=""
+  showspinner="true"
+/>
+`;