diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 06:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 06:07:56 +0300 |
| commit | 4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (patch) | |
| tree | 4b70c6b61345b2df075918cab6314d41b46cf80e /doc/topics | |
| parent | 6348b76e4b4dd4e398915c3150c1d02aafa3f13b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/autodevops/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/gitlab_flow.md | 2 | ||||
| -rw-r--r-- | doc/topics/index.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 8af5b6321f1..093f595258d 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -799,7 +799,7 @@ networkPolicy: ``` For more information on how to install Network Policies, see -[Install Cilium using GitLab CI](../../user/clusters/applications.md#install-cilium-using-gitlab-cicd). +[Install Cilium using GitLab CI/CD](../../user/clusters/applications.md#install-cilium-using-gitlab-cicd). #### Web Application Firewall (ModSecurity) customization diff --git a/doc/topics/gitlab_flow.md b/doc/topics/gitlab_flow.md index 0fab4de8454..fb47899c585 100644 --- a/doc/topics/gitlab_flow.md +++ b/doc/topics/gitlab_flow.md @@ -309,7 +309,7 @@ In old workflows, the continuous integration (CI) server commonly ran tests on t Developers had to ensure their code did not break the `master` branch. When using GitLab flow, developers create their branches from this `master` branch, so it is essential that it never breaks. Therefore, each merge request must be tested before it is accepted. -CI software like Travis CI and GitLab CI show the build results right in the merge request itself to make this easy. +CI software like Travis CI and GitLab CI/CD show the build results right in the merge request itself to make this easy. There is one drawback to testing merge requests: the CI server only tests the feature branch itself, not the merged result. Ideally, the server could also test the `master` branch after each change. diff --git a/doc/topics/index.md b/doc/topics/index.md index 71048ec5aa4..e2749b58b03 100644 --- a/doc/topics/index.md +++ b/doc/topics/index.md @@ -9,7 +9,7 @@ tutorials, technical overviews, blog posts) and videos. - [Auto DevOps](autodevops/index.md) - [Authentication](authentication/index.md) -- [Continuous Integration (GitLab CI)](../ci/README.md) +- [Continuous Integration (GitLab CI/CD)](../ci/README.md) - [Git](git/index.md) - [GitLab Flow](gitlab_flow.md) - [GitLab Installation](../install/README.md) |