diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:01 +0000 |
| commit | 95ad46159e4cd93f2b31838199180d824e041994 (patch) | |
| tree | d41880d3b6a0093463694978590e590efb08caef /doc/integration/jenkins.md | |
| parent | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (diff) | |
| download | gitlab-ce-95ad46159e4cd93f2b31838199180d824e041994.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/jenkins.md')
| -rw-r--r-- | doc/integration/jenkins.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md index fee30578be4..5514b756c00 100644 --- a/doc/integration/jenkins.md +++ b/doc/integration/jenkins.md @@ -6,8 +6,8 @@ In GitLab 8.3, Jenkins integration using the was deprecated in favor of the [GitLab Plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Plugin). The deprecated integration has been renamed to [Jenkins CI (Deprecated)](jenkins_deprecated.md) in the -project service settings. We may remove this in a future release and recommend -using the new 'Jenkins CI' project service instead which is described in this +integration settings. We may remove this in a future release and recommend +using the new 'Jenkins CI' integration instead which is described in this document. ## Overview @@ -138,7 +138,7 @@ configured or there was an error reporting the status via the API. ### Merge Request event does not trigger a Jenkins Pipeline -Check [service hook logs](../user/project/integrations/project_services.md#troubleshooting-project-services) for request failures or check the `/var/log/gitlab/gitlab-rails/production.log` file for messages like: +Check [service hook logs](../user/project/integrations/overview.md#troubleshooting-integrations) for request failures or check the `/var/log/gitlab/gitlab-rails/production.log` file for messages like: ```plaintext WebHook Error => Net::ReadTimeout |