Commit 4e6a56de authored by Marcel Amirault's avatar Marcel Amirault Committed by Achilleas Pipinellis

Docs: (EE Port) Merge EE doc/​integration to CE

parent ad2206dc
...@@ -8,8 +8,8 @@ This document describes how to set up Elasticsearch with GitLab. Once enabled, ...@@ -8,8 +8,8 @@ This document describes how to set up Elasticsearch with GitLab. Once enabled,
you'll have the benefit of fast search response times and the advantage of two you'll have the benefit of fast search response times and the advantage of two
special searches: special searches:
- [Advanced Global Search](../user/search/advanced_global_search.md) - [Advanced Global Search](https://docs.gitlab.com/ee/user/search/advanced_global_search.html)
- [Advanced Syntax Search](../user/search/advanced_search_syntax.md) - [Advanced Syntax Search](https://docs.gitlab.com/ee/user/search/advanced_search_syntax.html)
## Version Requirements ## Version Requirements
<!-- Please remember to update ee/lib/system_check/app/elasticsearch_check.rb if this changes --> <!-- Please remember to update ee/lib/system_check/app/elasticsearch_check.rb if this changes -->
......
...@@ -63,7 +63,7 @@ copied earlier in the 'API Token' field. ...@@ -63,7 +63,7 @@ copied earlier in the 'API Token' field.
For more information, see GitLab Plugin documentation about For more information, see GitLab Plugin documentation about
[Jenkins-to-GitLab authentication](https://github.com/jenkinsci/gitlab-plugin#jenkins-to-gitlab-authentication) [Jenkins-to-GitLab authentication](https://github.com/jenkinsci/gitlab-plugin#jenkins-to-gitlab-authentication)
![Jenkins GitLab plugin configuration](jenkins_gitlab_plugin_config.png) ![Jenkins GitLab plugin configuration](img/jenkins_gitlab_plugin_config.png)
## Configure a Jenkins project ## Configure a Jenkins project
...@@ -93,7 +93,7 @@ from the URL bar of your browser while viewing the Jenkins project. ...@@ -93,7 +93,7 @@ from the URL bar of your browser while viewing the Jenkins project.
Optionally, enter a username and password if your Jenkins server requires Optionally, enter a username and password if your Jenkins server requires
authentication. authentication.
![GitLab service settings](jenkins_gitlab_service_settings.png) ![GitLab service settings](img/jenkins_gitlab_service_settings.png)
## Plugin functional overview ## Plugin functional overview
......
...@@ -21,7 +21,7 @@ Requirements: ...@@ -21,7 +21,7 @@ Requirements:
1. Install [GitLab Hook plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Hook+Plugin) 1. Install [GitLab Hook plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Hook+Plugin)
2. Set up jenkins project 2. Set up jenkins project
![screen](jenkins_project.png) ![screen](img/jenkins_project.png)
## GitLab ## GitLab
...@@ -38,7 +38,7 @@ project. For that case we will need a Deploy key. Read the documentation on ...@@ -38,7 +38,7 @@ project. For that case we will need a Deploy key. Read the documentation on
Now navigate to GitLab services page and activate Jenkins Now navigate to GitLab services page and activate Jenkins
![screen](jenkins_gitlab_service.png) ![screen](img/jenkins_gitlab_service.png)
Done! Now when you push to GitLab - it will create a build for Jenkins. Done! Now when you push to GitLab - it will create a build for Jenkins.
And also you will be able to see merge request build status with a link to the Jenkins build. And also you will be able to see merge request build status with a link to the Jenkins build.
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment