diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /doc/university/training | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'doc/university/training')
19 files changed, 19 insertions, 0 deletions
diff --git a/doc/university/training/gitlab_flow.md b/doc/university/training/gitlab_flow.md index bdc97ff8d28..d38e39fcfe2 100644 --- a/doc/university/training/gitlab_flow.md +++ b/doc/university/training/gitlab_flow.md @@ -1,5 +1,6 @@ --- redirect_to: '../../topics/gitlab_flow.md' +remove_date: '2021-05-16' --- This document was moved to [another location](../../topics/gitlab_flow.md). diff --git a/doc/university/training/index.md b/doc/university/training/index.md index 02709314708..6d99c750d13 100644 --- a/doc/university/training/index.md +++ b/doc/university/training/index.md @@ -1,5 +1,6 @@ --- redirect_to: '../../topics/index.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../topics/index.md). diff --git a/doc/university/training/topics/agile_git.md b/doc/university/training/topics/agile_git.md index f912f92fad2..00ff778a241 100644 --- a/doc/university/training/topics/agile_git.md +++ b/doc/university/training/topics/agile_git.md @@ -1,5 +1,6 @@ --- 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). diff --git a/doc/university/training/topics/bisect.md b/doc/university/training/topics/bisect.md index 9c06f0b407d..64291a8194b 100644 --- a/doc/university/training/topics/bisect.md +++ b/doc/university/training/topics/bisect.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/bisect.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/bisect.md). diff --git a/doc/university/training/topics/cherry_picking.md b/doc/university/training/topics/cherry_picking.md index f0f815baa94..3e278b2c199 100644 --- a/doc/university/training/topics/cherry_picking.md +++ b/doc/university/training/topics/cherry_picking.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/cherry_picking.md' +remove_date: '2021-06-01' --- This document was moved to [another location](../../../topics/git/cherry_picking.md). diff --git a/doc/university/training/topics/env_setup.md b/doc/university/training/topics/env_setup.md index 2fd0a6762e2..4df0556c151 100644 --- a/doc/university/training/topics/env_setup.md +++ b/doc/university/training/topics/env_setup.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/index.md' +remove_date: '2021-08-13' --- This document was removed. See our [topics](../../../topics/index.md) for similar content. diff --git a/doc/university/training/topics/feature_branching.md b/doc/university/training/topics/feature_branching.md index 495462cdd00..94a2d0cdc69 100644 --- a/doc/university/training/topics/feature_branching.md +++ b/doc/university/training/topics/feature_branching.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/feature_branching.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/feature_branching.md). diff --git a/doc/university/training/topics/getting_started.md b/doc/university/training/topics/getting_started.md index 3dc3902c2e3..3e6fab73596 100644 --- a/doc/university/training/topics/getting_started.md +++ b/doc/university/training/topics/getting_started.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/getting_started.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/getting_started.md). diff --git a/doc/university/training/topics/git_add.md b/doc/university/training/topics/git_add.md index aa5e756995f..d7a5ce8dd6a 100644 --- a/doc/university/training/topics/git_add.md +++ b/doc/university/training/topics/git_add.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/git_add.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/git_add.md). diff --git a/doc/university/training/topics/git_intro.md b/doc/university/training/topics/git_intro.md index 2fd0a6762e2..4df0556c151 100644 --- a/doc/university/training/topics/git_intro.md +++ b/doc/university/training/topics/git_intro.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/index.md' +remove_date: '2021-08-13' --- This document was removed. See our [topics](../../../topics/index.md) for similar content. diff --git a/doc/university/training/topics/git_log.md b/doc/university/training/topics/git_log.md index 1af8abb0782..26f02cb8b17 100644 --- a/doc/university/training/topics/git_log.md +++ b/doc/university/training/topics/git_log.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/git_log.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/git_log.md). diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md index d76d297803f..f4f12a17dbd 100644 --- a/doc/university/training/topics/merge_conflicts.md +++ b/doc/university/training/topics/merge_conflicts.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/merge_conflicts.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/merge_conflicts.md). diff --git a/doc/university/training/topics/merge_requests.md b/doc/university/training/topics/merge_requests.md index 80ead103fdd..1ed6fe6d273 100644 --- a/doc/university/training/topics/merge_requests.md +++ b/doc/university/training/topics/merge_requests.md @@ -1,5 +1,6 @@ --- 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). diff --git a/doc/university/training/topics/rollback_commits.md b/doc/university/training/topics/rollback_commits.md index b87aa12b834..38d4ac493dd 100644 --- a/doc/university/training/topics/rollback_commits.md +++ b/doc/university/training/topics/rollback_commits.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/rollback_commits.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/rollback_commits.md). diff --git a/doc/university/training/topics/stash.md b/doc/university/training/topics/stash.md index ea9ba6a7bcc..b053c459cb0 100644 --- a/doc/university/training/topics/stash.md +++ b/doc/university/training/topics/stash.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/stash.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/stash.md). diff --git a/doc/university/training/topics/subtree.md b/doc/university/training/topics/subtree.md index 5090ff8ca36..a1c1c00baaa 100644 --- a/doc/university/training/topics/subtree.md +++ b/doc/university/training/topics/subtree.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/subtree.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/subtree.md). diff --git a/doc/university/training/topics/tags.md b/doc/university/training/topics/tags.md index 28fd8400d99..53250e3540a 100644 --- a/doc/university/training/topics/tags.md +++ b/doc/university/training/topics/tags.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/tags.md' +remove_date: '2021-06-01' --- This document was moved to [another location](../../../topics/git/tags.md). diff --git a/doc/university/training/topics/unstage.md b/doc/university/training/topics/unstage.md index 13c21f5cbb2..c64f5be96e7 100644 --- a/doc/university/training/topics/unstage.md +++ b/doc/university/training/topics/unstage.md @@ -1,5 +1,6 @@ --- redirect_to: '../../../topics/git/unstage.md' +remove_date: '2021-08-13' --- This document was moved to [another location](../../../topics/git/unstage.md). diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md index fa870b151b2..a19f9b6b6b3 100644 --- a/doc/university/training/user_training.md +++ b/doc/university/training/user_training.md @@ -1,5 +1,6 @@ --- redirect_to: '../../topics/index.md' +remove_date: '2021-08-13' --- This document was removed. See our [topics](../../topics/index.md) for similar content. |