From 789fcff87d2820831c8a0668373e6507c9c2ba51 Mon Sep 17 00:00:00 2001
From: Maxime Orefice <morefice@gitlab.com>
Date: Thu, 28 Oct 2021 16:25:36 -0400
Subject: [PATCH 1/2] Update accessibility template v6.0.1

This commit uses the latest version of pa11y which now supports
WCAG 2.1 rules. This might end up raising more errors on
accesibility reports.

See https://github.com/pa11y/pa11y/blob/master/MIGRATION.md

Changelog: other
---
 doc/user/project/merge_requests/accessibility_testing.md   | 2 ++
 lib/gitlab/ci/templates/Verify/Accessibility.gitlab-ci.yml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/user/project/merge_requests/accessibility_testing.md b/doc/user/project/merge_requests/accessibility_testing.md
index 2bc6d5bb148678c5..4b4c852e88a1e2e6 100644
--- a/doc/user/project/merge_requests/accessibility_testing.md
+++ b/doc/user/project/merge_requests/accessibility_testing.md
@@ -21,6 +21,8 @@ measuring the accessibility of web sites, and has built a simple
 This job outputs accessibility violations, warnings, and notices for each page
 analyzed to a file called `accessibility`.
 
+In [GitLab 14.5](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73309), the latest version of `pa11y` is now using [WCAG 2.1 rules](https://www.w3.org/TR/WCAG21/#new-features-in-wcag-2-1) which may now report more issues.
+
 ## Accessibility merge request widget
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/39425) in GitLab 13.0 behind the disabled [feature flag](../../../administration/feature_flags.md) `:accessibility_report_view`.
diff --git a/lib/gitlab/ci/templates/Verify/Accessibility.gitlab-ci.yml b/lib/gitlab/ci/templates/Verify/Accessibility.gitlab-ci.yml
index 22c40d8a8b89cc4e..4f63ff93d4d7003a 100644
--- a/lib/gitlab/ci/templates/Verify/Accessibility.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Verify/Accessibility.gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
 
 a11y:
   stage: accessibility
-  image: registry.gitlab.com/gitlab-org/ci-cd/accessibility:5.3.0-gitlab.3
+  image: registry.gitlab.com/gitlab-org/ci-cd/accessibility:6.0.1
   script: /gitlab-accessibility.sh $a11y_urls
   allow_failure: true
   artifacts:
-- 
GitLab


From ddda9c7be0881a7230c79b596ea732a6ce2a77ff Mon Sep 17 00:00:00 2001
From: Evan Read <eread@gitlab.com>
Date: Mon, 15 Nov 2021 08:31:51 +0000
Subject: [PATCH 2/2] Apply code review feedback

---
 doc/user/project/merge_requests/accessibility_testing.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/user/project/merge_requests/accessibility_testing.md b/doc/user/project/merge_requests/accessibility_testing.md
index 4b4c852e88a1e2e6..8f803f9207c8e44e 100644
--- a/doc/user/project/merge_requests/accessibility_testing.md
+++ b/doc/user/project/merge_requests/accessibility_testing.md
@@ -21,7 +21,8 @@ measuring the accessibility of web sites, and has built a simple
 This job outputs accessibility violations, warnings, and notices for each page
 analyzed to a file called `accessibility`.
 
-In [GitLab 14.5](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73309), the latest version of `pa11y` is now using [WCAG 2.1 rules](https://www.w3.org/TR/WCAG21/#new-features-in-wcag-2-1) which may now report more issues.
+From [GitLab 14.5](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73309), the version of `pa11y` uses
+[WCAG 2.1 rules](https://www.w3.org/TR/WCAG21/#new-features-in-wcag-2-1), which may report more issues.
 
 ## Accessibility merge request widget
 
-- 
GitLab