Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 19 deletions

diff --git a/glfm_specification/output_example_snapshots/html.yml b/glfm_specification/output_example_snapshots/html.yml
index 199512ef6e6..a301ab48fc0 100644
--- a/glfm_specification/output_example_snapshots/html.yml
+++ b/glfm_specification/output_example_snapshots/html.yml
@@ -1908,7 +1908,7 @@
     <!-- foo -->*bar*
     <p><em>baz</em></p>
   static: |-
-    <!-- foo -->*bar*
+    *bar*
     <p data-sourcepos="2:1-2:5" dir="auto"><em>baz</em></p>
   wysiwyg: |-
     <p dir="auto">*bar*
@@ -1930,11 +1930,8 @@
     bar
        baz -->
     <p>okay</p>
-  static: |-
-    <!-- Foo
+  static: |2-
 
-    bar
-       baz -->
     <p data-sourcepos="5:1-5:4" dir="auto">okay</p>
   wysiwyg: |-
     <p dir="auto">okay</p>
@@ -1988,12 +1985,10 @@
       <!-- foo -->
     <pre><code>&lt;!-- foo --&gt;
     </code></pre>
-  static: |2-
-      <!-- foo -->
-    <div class="gl-relative markdown-code-block js-markdown-code">
-    <pre data-sourcepos="3:5-3:16" class="code highlight js-syntax-highlight language-plaintext" lang="plaintext" v-pre="true"><code><span id="LC1" class="line" lang="plaintext">&lt;!-- foo --&gt;</span></code></pre>
-    <copy-code></copy-code>
-    </div>
+  static: "  \n<div class=\"gl-relative markdown-code-block js-markdown-code\">\n<pre
+    data-sourcepos=\"3:5-3:16\" class=\"code highlight js-syntax-highlight language-plaintext\"
+    lang=\"plaintext\" v-pre=\"true\"><code><span id=\"LC1\" class=\"line\" lang=\"plaintext\">&lt;!--
+    foo --&gt;</span></code></pre>\n<copy-code></copy-code>\n</div>"
   wysiwyg: |-
     <pre dir="auto" class="content-editor-code-block undefined code highlight"><code>&lt;!-- foo --&gt;</code></pre>
 04_06_00__leaf_blocks__html_blocks__036:
@@ -4313,7 +4308,7 @@
     <li data-sourcepos="1:1-1:5">foo</li>
     <li data-sourcepos="2:1-3:0">bar</li>
     </ul>
-    <!-- -->
+
     <ul data-sourcepos="6:1-7:5" dir="auto">
     <li data-sourcepos="6:1-6:5">baz</li>
     <li data-sourcepos="7:1-7:5">bim</li>
@@ -4345,7 +4340,7 @@
     <p data-sourcepos="5:5-5:7">foo</p>
     </li>
     </ul>
-    <!-- -->
+
     <div class="gl-relative markdown-code-block js-markdown-code">
     <pre data-sourcepos="9:5-9:8" class="code highlight js-syntax-highlight language-plaintext" lang="plaintext" v-pre="true"><code><span id="LC1" class="line" lang="plaintext">code</span></code></pre>
     <copy-code></copy-code>
@@ -7384,15 +7379,14 @@
     <p>foo <!-- this is a
     comment - with hyphen --></p>
   static: |-
-    <p data-sourcepos="1:1-2:25" dir="auto">foo <!-- this is a
-    comment - with hyphen --></p>
+    <p data-sourcepos="1:1-2:25" dir="auto">foo </p>
   wysiwyg: |-
     <p dir="auto">foo </p>
 06_11_00__inlines__raw_html__014:
   canonical: |
     <p>foo &lt;!-- not a comment -- two hyphens --&gt;</p>
   static: |-
-    <p data-sourcepos="1:1-1:41" dir="auto">foo <!-- not a comment -- two hyphens --></p>
+    <p data-sourcepos="1:1-1:41" dir="auto">foo </p>
   wysiwyg: |-
     <p dir="auto">foo &lt;!-- not a comment -- two hyphens --&gt;</p>
 06_11_00__inlines__raw_html__015:
@@ -7400,7 +7394,7 @@
     <p>foo &lt;!--&gt; foo --&gt;</p>
     <p>foo &lt;!-- foo---&gt;</p>
   static: |-
-    <p data-sourcepos="1:1-1:17" dir="auto">foo <!----> foo --&gt;</p>
+    <p data-sourcepos="1:1-1:17" dir="auto">foo  foo --&gt;</p>
     <p data-sourcepos="3:1-3:16" dir="auto">foo &lt;!-- foo---&gt;</p>
   wysiwyg: |-
     <p dir="auto">foo &lt;!--&gt; foo --&gt;</p>
diff --git a/glfm_specification/output_spec/spec.html b/glfm_specification/output_spec/spec.html
index 4ec7f683124..6ede9858af1 100644
--- a/glfm_specification/output_spec/spec.html
+++ b/glfm_specification/output_spec/spec.html
@@ -267,7 +267,7 @@ for a complete list of all examples, which are a superset of examples from:</p>
 <li data-sourcepos="23:1-23:88">GitLab Flavored Markdown Official Specification (the same ones from this specifiation)</li>
 <li data-sourcepos="24:1-25:0">GitLab Flavored Markdown Internal Extensions.</li>
 </ul>
-<!-- BEGIN TESTS -->
+
 <h1 data-sourcepos="27:1-27:40" dir="auto">
 <a id="user-content-gitlab-official-specification-markdown" class="anchor" href="#gitlab-official-specification-markdown" aria-hidden="true"></a>GitLab Official Specification Markdown</h1>
 <p data-sourcepos="29:1-31:104" dir="auto">Note: This specification is a work in progress. Only some of the official GLFM extensions
@@ -563,7 +563,7 @@ line.</p>
 <copy-code></copy-code>
 </div>
 </div>
-<!-- END TESTS -->
+
 
 </body>
 </html>