Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/data/deprecations/14-3-repository-push-audit-events.yml b/data/deprecations/14-3-repository-push-audit-events.yml
index 9f9f9809663..6fafd7ba6db 100644
--- a/data/deprecations/14-3-repository-push-audit-events.yml
+++ b/data/deprecations/14-3-repository-push-audit-events.yml
@@ -2,7 +2,7 @@
   announcement_milestone: "14.3" # The milestone when this feature was first announced as deprecated.
   removal_milestone: "15.0" # the milestone when this feature is planned to be removed
   body: | # Do not modify this line, instead modify the lines below.
-    Audit events for [repository events](../administration/audit_events.md#repository-push) are now deprecated and will be removed in GitLab 15.0.
+    Audit events for [repository events](https://docs.gitlab.com/ee/administration/audit_events.html#repository-push) are now deprecated and will be removed in GitLab 15.0.
 
     These events have always been disabled by default and had to be manually enabled with a
     feature flag. Enabling them can cause too many events to be generated which can
@@ -10,5 +10,5 @@
   stage: Manage
   tiers: Premium
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337993
-  documentation_url: ../administration/audit_events.md
+  documentation_url: https://docs.gitlab.com/ee/administration/audit_events.html#repository-push
   announcement_date: 2021-09-02 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69024
diff --git a/data/deprecations/deprecation_omniauth-kerberos_gem.yml b/data/deprecations/deprecation_omniauth-kerberos_gem.yml
index 9abaa343812..f7068552ff9 100644
--- a/data/deprecations/deprecation_omniauth-kerberos_gem.yml
+++ b/data/deprecations/deprecation_omniauth-kerberos_gem.yml
@@ -4,12 +4,12 @@
   body: | # Do not modify this line, instead modify the lines below.
     The `omniauth-kerberos` gem will be removed in our next major release, GitLab 15.0.
 
-    This gem has not been maintained and has very little usage. We therefore plan to remove support for this authentication method and recommend using the Kerberos [SPNEGO](https://en.wikipedia.org/wiki/SPNEGO) integration instead. You can follow the [upgrade instructions](../integration/kerberos.md#upgrading-from-password-based-to-ticket-based-kerberos-sign-ins) to upgrade from the `omniauth-kerberos` integration to the supported one.
+    This gem has not been maintained and has very little usage. We therefore plan to remove support for this authentication method and recommend using the Kerberos [SPNEGO](https://en.wikipedia.org/wiki/SPNEGO) integration instead. You can follow the [upgrade instructions](https://docs.gitlab.com/ee/integration/kerberos.html#upgrading-from-password-based-to-ticket-based-kerberos-sign-ins) to upgrade from the `omniauth-kerberos` integration to the supported one.
 
     Note that we are not deprecating the Kerberos SPNEGO integration, only the old password-based Kerberos integration.
   stage: Manage
-  tiers:  [Premium, Ultimate]
+  tiers: [Premium, Ultimate]
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337384
-  documentation_url: ../integration/kerberos.md#upgrading-from-password-based-to-ticket-based-kerberos-sign-ins
+  documentation_url: https://docs.gitlab.com/ee/integration/kerberos.html#upgrading-from-password-based-to-ticket-based-kerberos-sign-ins
   announcement_date: 2021-22-09