Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

16 files changed, 0 insertions, 144 deletions

diff --git a/doc/university/training/index.md b/doc/university/training/index.md
deleted file mode 100644
index 6d99c750d13..00000000000
--- a/doc/university/training/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../topics/index.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../topics/index.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/agile_git.md b/doc/university/training/topics/agile_git.md
deleted file mode 100644
index 00ff778a241..00000000000
--- a/doc/university/training/topics/agile_git.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../user/project/issue_board.md'
-remove_date: '2021-07-23'
----
-
-Information about using Agile concepts in GitLab can be found in [another location](../../../user/project/issue_board.md).
-
-<!-- This redirect file can be deleted after <2021-07-23>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/bisect.md b/doc/university/training/topics/bisect.md
deleted file mode 100644
index 64291a8194b..00000000000
--- a/doc/university/training/topics/bisect.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/bisect.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/bisect.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/env_setup.md b/doc/university/training/topics/env_setup.md
deleted file mode 100644
index 4df0556c151..00000000000
--- a/doc/university/training/topics/env_setup.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/index.md'
-remove_date: '2021-08-13'
----
-
-This document was removed. See our [topics](../../../topics/index.md) for similar content.
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/feature_branching.md b/doc/university/training/topics/feature_branching.md
deleted file mode 100644
index 94a2d0cdc69..00000000000
--- a/doc/university/training/topics/feature_branching.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/feature_branching.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/feature_branching.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/getting_started.md b/doc/university/training/topics/getting_started.md
deleted file mode 100644
index 3e6fab73596..00000000000
--- a/doc/university/training/topics/getting_started.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/getting_started.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/getting_started.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/git_add.md b/doc/university/training/topics/git_add.md
deleted file mode 100644
index d7a5ce8dd6a..00000000000
--- a/doc/university/training/topics/git_add.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/git_add.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/git_add.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/git_intro.md b/doc/university/training/topics/git_intro.md
deleted file mode 100644
index 4df0556c151..00000000000
--- a/doc/university/training/topics/git_intro.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/index.md'
-remove_date: '2021-08-13'
----
-
-This document was removed. See our [topics](../../../topics/index.md) for similar content.
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/git_log.md b/doc/university/training/topics/git_log.md
deleted file mode 100644
index 26f02cb8b17..00000000000
--- a/doc/university/training/topics/git_log.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/git_log.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/git_log.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md
deleted file mode 100644
index f4f12a17dbd..00000000000
--- a/doc/university/training/topics/merge_conflicts.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/merge_conflicts.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/merge_conflicts.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/merge_requests.md b/doc/university/training/topics/merge_requests.md
deleted file mode 100644
index 1ed6fe6d273..00000000000
--- a/doc/university/training/topics/merge_requests.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../user/project/merge_requests/index.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../user/project/merge_requests/index.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/rollback_commits.md b/doc/university/training/topics/rollback_commits.md
deleted file mode 100644
index 38d4ac493dd..00000000000
--- a/doc/university/training/topics/rollback_commits.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/rollback_commits.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/rollback_commits.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/stash.md b/doc/university/training/topics/stash.md
deleted file mode 100644
index b053c459cb0..00000000000
--- a/doc/university/training/topics/stash.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/stash.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/stash.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/subtree.md b/doc/university/training/topics/subtree.md
deleted file mode 100644
index a1c1c00baaa..00000000000
--- a/doc/university/training/topics/subtree.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/subtree.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/subtree.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/topics/unstage.md b/doc/university/training/topics/unstage.md
deleted file mode 100644
index c64f5be96e7..00000000000
--- a/doc/university/training/topics/unstage.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../../topics/git/unstage.md'
-remove_date: '2021-08-13'
----
-
-This document was moved to [another location](../../../topics/git/unstage.md).
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md
deleted file mode 100644
index a19f9b6b6b3..00000000000
--- a/doc/university/training/user_training.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: '../../topics/index.md'
-remove_date: '2021-08-13'
----
-
-This document was removed. See our [topics](../../topics/index.md) for similar content.
-
-<!-- This redirect file can be deleted after <2021-08-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->