summaryrefslogtreecommitdiff
path: root/doc/university
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 03:07:56 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 03:07:56 +0000
commit4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (patch)
tree4b70c6b61345b2df075918cab6314d41b46cf80e /doc/university
parent6348b76e4b4dd4e398915c3150c1d02aafa3f13b (diff)
downloadgitlab-ce-4560c92ab1954cf0416bafc45d1fa671fcacb3c3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/university')
-rw-r--r--doc/university/README.md2
-rw-r--r--doc/university/support/README.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/university/README.md b/doc/university/README.md
index 2275130b3ab..9d3d3b33560 100644
--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -107,7 +107,7 @@ The GitLab University curriculum is composed of GitLab videos, screencasts, pres
### 2.3. Continuous Integration
1. [Operating Systems, Servers, VMs, Containers and Unix - Video](https://www.youtube.com/watch?v=V61kL6IC-zY&index=8&list=PLFGfElNsQthbQu_IWlNOxul0TbS_2JH-e)
-1. [GitLab CI - Product Page](https://about.gitlab.com/stages-devops-lifecycle/continuous-integration/)
+1. [GitLab CI/CD - Product Page](https://about.gitlab.com/stages-devops-lifecycle/continuous-integration/)
1. [Getting started with GitLab and GitLab CI](https://about.gitlab.com/blog/2015/12/14/getting-started-with-gitlab-and-gitlab-ci/)
1. [GitLab Container Registry](https://about.gitlab.com/blog/2016/05/23/gitlab-container-registry/)
1. [GitLab and Docker - Video](https://www.youtube.com/watch?v=ugOrCcbdHko&index=12&list=PLFGfElNsQthbQu_IWlNOxul0TbS_2JH-e)
diff --git a/doc/university/support/README.md b/doc/university/support/README.md
index ebdd453ff3c..ab40f1b3610 100644
--- a/doc/university/support/README.md
+++ b/doc/university/support/README.md
@@ -173,7 +173,7 @@ Move on to understanding some of GitLab's more advanced features. You can make u
- Set up and try [Git LFS](../../administration/lfs/manage_large_binaries_with_git_lfs.md)
- Get to know the [GitLab API](../../api/README.md), its capabilities and shortcomings
- Learn how to [migrate from SVN to Git](../../user/project/import/svn.md)
-- Set up [GitLab CI](../../ci/quick_start/README.md)
+- Set up [GitLab CI/CD](../../ci/quick_start/README.md)
- Create your first [GitLab Page](../../administration/pages/index.md)
- Get to know the GitLab Codebase by reading through the source code:
- Find the differences between the [EE codebase](https://gitlab.com/gitlab-org/gitlab-foss)