diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 03:07:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 03:07:56 +0000 |
| commit | 4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (patch) | |
| tree | 4b70c6b61345b2df075918cab6314d41b46cf80e /doc/integration | |
| parent | 6348b76e4b4dd4e398915c3150c1d02aafa3f13b (diff) | |
| download | gitlab-ce-4560c92ab1954cf0416bafc45d1fa671fcacb3c3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/jenkins.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md index 77912a543d0..fee30578be4 100644 --- a/doc/integration/jenkins.md +++ b/doc/integration/jenkins.md @@ -13,7 +13,7 @@ document. ## Overview [Jenkins](https://jenkins.io/) is a great Continuous Integration tool, similar to our built-in -[GitLab CI](../ci/README.md). +[GitLab CI/CD](../ci/README.md). GitLab's Jenkins integration allows you to trigger a Jenkins build when you push code to a repository, or when a merge request is created. Additionally, @@ -26,7 +26,7 @@ and [Migrating from Jenkins to GitLab](https://www.youtube.com/watch?v=RlEVGOpYF - Suppose you are new to GitLab, and want to keep using Jenkins until you prepare your projects to build with [GitLab CI/CD](../ci/README.md). You set up the - integration between GitLab and Jenkins, then you migrate to GitLab CI later. While + integration between GitLab and Jenkins, then you migrate to GitLab CI/CD later. While you organize yourself and your team to onboard GitLab, you keep your pipelines running with Jenkins, but view the results in your project's repository in GitLab. - Your team uses [Jenkins Plugins](https://plugins.jenkins.io/) for other proceedings, |