Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

4 files changed, 67 insertions, 49 deletions

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 91cc9c3b4d7..e4d01b4a813 100644
--- a/glfm_specification/input/gitlab_flavored_markdown/glfm_canonical_examples.txt
+++ b/glfm_specification/input/gitlab_flavored_markdown/glfm_canonical_examples.txt
@@ -1,23 +1,20 @@
-# First GitLab-Specific Section with Examples
+# GitLab-Specific Markdown
 
-## Strong but with two asterisks
+Currently, only some of the GitLab-specific markdown features are
+listed in this section. We will eventually add all
+GitLab-specific features currently listed as supported in the
+[user-facing documentation for GitLab Flavored Markdown](https://docs.gitlab.com/ee/user/markdown.html).
 
-```````````````````````````````` example
-**bold**
-.
-<p><strong>bold</strong></p>
-````````````````````````````````
+There is currently only this single top-level heading, but the
+examples may be split into multiple top-level headings in the future.
+
+## Footnotes
 
-# Second GitLab-Specific Section with Examples
+See
+[the footnotes section of the user-facing documentation for GitLab Flavored Markdown](https://docs.gitlab.com/ee/user/markdown.html#footnotes).
 
-## Strong but with HTML
+```````````````````````````````` example gitlab footnote
+footnote reference tag [^1]
 
-```````````````````````````````` example
-<strong>
-bold
-</strong>
-.
-<p><strong>
-bold
-</strong></p>
+[^1]: footnote text
 ````````````````````````````````
diff --git a/glfm_specification/input/gitlab_flavored_markdown/glfm_example_normalizations.yml b/glfm_specification/input/gitlab_flavored_markdown/glfm_example_normalizations.yml
new file mode 100644
index 00000000000..15df659f0f4
--- /dev/null
+++ b/glfm_specification/input/gitlab_flavored_markdown/glfm_example_normalizations.yml
@@ -0,0 +1,27 @@
+---
+# See the following documentation for more info on normalization:
+#
+# - https://docs.gitlab.com/ee/development/gitlab_flavored_markdown/specification_guide/#normalization
+# - https://docs.gitlab.com/ee/development/gitlab_flavored_markdown/specification_guide/#glfm_example_normalizationsyml
+#
+# NOTE: All YAML anchors which are shared across one or more entries are defined in the `00_shared` section.
+00_shared:
+  00_uri: &00_uri
+    - regex: '(href|data-src)(=")(.*?)(test-file\.(png|zip)")'
+      replacement: '\1\2URI_PREFIX\4'
+07_01__gitlab_specific_markdown__footnotes__001:
+  html:
+    static:
+      shared:
+        07_01_href: &07_01_href
+          - regex: '(href)(=")(.+?)(")'
+            replacement: '\1\2REF\4'
+        07_01_id: &07_01_id
+          - regex: '(id)(=")(.+?)(")'
+            replacement: '\1\2ID\4'
+      canonical:
+        07_01_href: *07_01_href
+        07_01_id: *07_01_id
+      snapshot:
+        07_01_href: *07_01_href
+        07_01_id: *07_01_id
diff --git a/glfm_specification/input/gitlab_flavored_markdown/glfm_example_status.yml b/glfm_specification/input/gitlab_flavored_markdown/glfm_example_status.yml
index 3124da068c3..591148b41dd 100644
--- a/glfm_specification/input/gitlab_flavored_markdown/glfm_example_status.yml
+++ b/glfm_specification/input/gitlab_flavored_markdown/glfm_example_status.yml
@@ -1,17 +1,14 @@
 ---
-- 06_05__inlines__emphasis_and_strong_emphasis__37:
-  skip_update_example_snapshots: 'Psych YAML library has a problem with dumping "5__6__78", it thinks its an invalid integer'
-- 07_01_first_gitlab_specific_section_with_examples_strong_but_with_two_asterisks:
+02_01__preliminaries__tabs__001:
+  # NOTE: False values are optional, they are only included here for reference. See
+  # https://docs.gitlab.com/ee/development/gitlab_flavored_markdown/specification_guide/#glfm_example_statusyml
+  # for more details.
   skip_update_example_snapshots: false
-  skip_running_snapshot_static_html_tests: false
-  skip_running_snapshot_wysiwyg_html_tests: false
-  skip_running_snapshot_prosemirror_json_tests: false
-  skip_running_conformance_static_tests: false
-  skip_running_conformance_wysiwyg_tests: false
-- 07_02_first_gitlab_specific_section_with_examples_strong_but_with_html:
-  skip_update_example_snapshots: false
-  skip_running_snapshot_static_html_tests: false
-  skip_running_snapshot_wysiwyg_html_tests: false
-  skip_running_snapshot_prosemirror_json_tests: false
-  skip_running_conformance_static_tests: false
-  skip_running_conformance_wysiwyg_tests: false
+  skip_update_example_snapshot_html_static: false
+  skip_update_example_snapshot_html_wysiwyg: false
+  skip_update_example_snapshot_prosemirror_json: false
+  skip_running_conformance_static_tests: false # NOT YET SUPPORTED
+  skip_running_conformance_wysiwyg_tests: false # NOT YET SUPPORTED
+  skip_running_snapshot_static_html_tests: false # NOT YET SUPPORTED
+  skip_running_snapshot_wysiwyg_html_tests: false # NOT YET SUPPORTED
+  skip_running_snapshot_prosemirror_json_tests: false # NOT YET SUPPORTED
diff --git a/glfm_specification/output/spec.txt b/glfm_specification/output/spec.txt
index 059a934ee32..c81daf7f689 100644
--- a/glfm_specification/output/spec.txt
+++ b/glfm_specification/output/spec.txt
@@ -9600,28 +9600,25 @@ Multiple     spaces
 ````````````````````````````````
 
 
-# First GitLab-Specific Section with Examples
+# GitLab-Specific Markdown
 
-## Strong but with two asterisks
+Currently, only some of the GitLab-specific markdown features are
+listed in this section. We will eventually add all
+GitLab-specific features currently listed as supported in the
+[user-facing documentation for GitLab Flavored Markdown](https://docs.gitlab.com/ee/user/markdown.html).
 
-```````````````````````````````` example
-**bold**
-.
-<p><strong>bold</strong></p>
-````````````````````````````````
+There is currently only this single top-level heading, but the
+examples may be split into multiple top-level headings in the future.
 
-# Second GitLab-Specific Section with Examples
+## Footnotes
 
-## Strong but with HTML
+See
+[the footnotes section of the user-facing documentation for GitLab Flavored Markdown](https://docs.gitlab.com/ee/user/markdown.html#footnotes).
 
-```````````````````````````````` example
-<strong>
-bold
-</strong>
-.
-<p><strong>
-bold
-</strong></p>
+```````````````````````````````` example gitlab footnote
+footnote reference tag [^1]
+
+[^1]: footnote text
 ````````````````````````````````
 
 <!-- END TESTS -->