Add latest changes from gitlab-org/gitlab@master

5 files changed, 74 insertions, 15 deletions

diff --git a/glfm_specification/example_snapshots/html.yml b/glfm_specification/example_snapshots/html.yml
index 6c05fbe744b..376a4bc72ca 100644
--- a/glfm_specification/example_snapshots/html.yml
+++ b/glfm_specification/example_snapshots/html.yml
@@ -7556,16 +7556,35 @@
   wysiwyg: |-
     <p>Multiple     spaces</p>
 07_01__gitlab_specific_markdown__footnotes__001:
-  canonical: ""
+  canonical: |
+    <p>
+    footnote reference tag
+    <sup>
+    <a href="#fn-fortytwo-42" id="fnref-fortytwo-42" data-footnote-ref>
+    1
+    </a>
+    </sup>
+    </p>
+    <section data-footnotes>
+    <ol>
+    <li id="fn-fortytwo-42">
+    <p>
+    footnote text
+    <a href="#fnref-fortytwo-42" data-footnote-backref>
+    </a>
+    </p>
+    </li>
+    </ol>
+    </section>
   static: |-
-    <p data-sourcepos="1:1-1:27" dir="auto">footnote reference tag <sup class="footnote-ref"><a href="#fn-1-9034" id="fnref-1-9034" data-footnote-ref>1</a></sup></p>
+    <p data-sourcepos="1:1-1:34" dir="auto">footnote reference tag <sup class="footnote-ref"><a href="#fn-fortytwo-42" id="fnref-fortytwo-42" data-footnote-ref>1</a></sup></p>
     <section data-footnotes class="footnotes">
     <ol>
-    <li id="fn-1-9034">
-    <p data-sourcepos="3:7-3:19">footnote text <a href="#fnref-1-9034" data-footnote-backref aria-label="Back to content" class="footnote-backref"><gl-emoji title="leftwards arrow with hook" data-name="leftwards_arrow_with_hook" data-unicode-version="1.1">↩</gl-emoji></a></p>
+    <li id="fn-fortytwo-42">
+    <p data-sourcepos="3:14-3:26">footnote text <a href="#fnref-fortytwo-42" data-footnote-backref aria-label="Back to content" class="footnote-backref"><gl-emoji title="leftwards arrow with hook" data-name="leftwards_arrow_with_hook" data-unicode-version="1.1">↩</gl-emoji></a></p>
     </li>
     </ol>
     </section>
   wysiwyg: |-
-    <p>footnote reference tag <sup identifier="1">1</sup></p>
+    <p>footnote reference tag <sup identifier="fortytwo">fortytwo</sup></p>
     <div node="footnoteDefinition(paragraph(&quot;footnote text&quot;))" htmlattributes="[object Object]"><p>footnote text</p></div>
diff --git a/glfm_specification/example_snapshots/markdown.yml b/glfm_specification/example_snapshots/markdown.yml
index de0e66f7e08..c4c30dcb513 100644
--- a/glfm_specification/example_snapshots/markdown.yml
+++ b/glfm_specification/example_snapshots/markdown.yml
@@ -2190,6 +2190,6 @@
 06_15__inlines__textual_content__003: |
   Multiple     spaces
 07_01__gitlab_specific_markdown__footnotes__001: |
-  footnote reference tag [^1]
+  footnote reference tag [^fortytwo]
 
-  [^1]: footnote text
+  [^fortytwo]: footnote text
diff --git a/glfm_specification/example_snapshots/prosemirror_json.yml b/glfm_specification/example_snapshots/prosemirror_json.yml
index 0a8c15e9650..0b468945042 100644
--- a/glfm_specification/example_snapshots/prosemirror_json.yml
+++ b/glfm_specification/example_snapshots/prosemirror_json.yml
@@ -19218,8 +19218,8 @@
           {
             "type": "footnoteReference",
             "attrs": {
-              "identifier": "1",
-              "label": "1"
+              "identifier": "fortytwo",
+              "label": "fortytwo"
             }
           }
         ]
@@ -19227,8 +19227,8 @@
       {
         "type": "footnoteDefinition",
         "attrs": {
-          "identifier": "1",
-          "label": "1"
+          "identifier": "fortytwo",
+          "label": "fortytwo"
         },
         "content": [
           {
diff --git a/glfm_specification/input/gitlab_flavored_markdown/glfm_canonical_examples.txt b/glfm_specification/input/gitlab_flavored_markdown/glfm_canonical_examples.txt
index e4d01b4a813..d0d450b66bf 100644
--- a/glfm_specification/input/gitlab_flavored_markdown/glfm_canonical_examples.txt
+++ b/glfm_specification/input/gitlab_flavored_markdown/glfm_canonical_examples.txt
@@ -14,7 +14,27 @@ See
 [the footnotes section of the user-facing documentation for GitLab Flavored Markdown](https://docs.gitlab.com/ee/user/markdown.html#footnotes).
 
 ```````````````````````````````` example gitlab footnote
-footnote reference tag [^1]
+footnote reference tag [^fortytwo]
 
-[^1]: footnote text
+[^fortytwo]: footnote text
+.
+<p>
+footnote reference tag
+<sup>
+<a href="#fn-fortytwo-42" id="fnref-fortytwo-42" data-footnote-ref>
+1
+</a>
+</sup>
+</p>
+<section data-footnotes>
+<ol>
+<li id="fn-fortytwo-42">
+<p>
+footnote text
+<a href="#fnref-fortytwo-42" data-footnote-backref>
+</a>
+</p>
+</li>
+</ol>
+</section>
 ````````````````````````````````
diff --git a/glfm_specification/output/spec.txt b/glfm_specification/output/spec.txt
index c81daf7f689..3fc27efdc34 100644
--- a/glfm_specification/output/spec.txt
+++ b/glfm_specification/output/spec.txt
@@ -9616,9 +9616,29 @@ See
 [the footnotes section of the user-facing documentation for GitLab Flavored Markdown](https://docs.gitlab.com/ee/user/markdown.html#footnotes).
 
 ```````````````````````````````` example gitlab footnote
-footnote reference tag [^1]
+footnote reference tag [^fortytwo]
 
-[^1]: footnote text
+[^fortytwo]: footnote text
+.
+<p>
+footnote reference tag
+<sup>
+<a href="#fn-fortytwo-42" id="fnref-fortytwo-42" data-footnote-ref>
+1
+</a>
+</sup>
+</p>
+<section data-footnotes>
+<ol>
+<li id="fn-fortytwo-42">
+<p>
+footnote text
+<a href="#fnref-fortytwo-42" data-footnote-backref>
+</a>
+</p>
+</li>
+</ol>
+</section>
 ````````````````````````````````
 
 <!-- END TESTS -->