summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 03:09:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 03:09:14 +0000
commit78fe72d153260c355fdfd533b125026cce310da7 (patch)
tree0d90106443bea87cc24e2834273ae6c8dcac0260 /doc/integration
parent88797b994a7dfd9bfab2a5d5431f088f17078b9f (diff)
downloadgitlab-ce-78fe72d153260c355fdfd533b125026cce310da7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/elasticsearch.md2
-rw-r--r--doc/integration/img/jira_dev_panel_jira_setup_1-1.pngbin45848 -> 13286 bytes
-rw-r--r--doc/integration/img/jira_dev_panel_setup_com_1.pngbin50565 -> 15392 bytes
-rw-r--r--doc/integration/img/jira_dev_panel_setup_com_2.pngbin66881 -> 22370 bytes
-rw-r--r--doc/integration/img/jira_dev_panel_setup_com_3.pngbin24910 -> 7639 bytes
5 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index c2f4fff0ce3..e7667ea8080 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -54,7 +54,7 @@ The way you install the Go indexer depends on your version of GitLab:
### GitLab Omnibus
-Since GitLab 11.8 the Go indexer is included in GitLab Omnibus.
+Since GitLab 11.8 the Go indexer is included in GitLab Omnibus.
The former Ruby-based indexer was removed in [GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/issues/6481).
### From source
diff --git a/doc/integration/img/jira_dev_panel_jira_setup_1-1.png b/doc/integration/img/jira_dev_panel_jira_setup_1-1.png
index e3c6c01c153..cef903ac9b4 100644
--- a/doc/integration/img/jira_dev_panel_jira_setup_1-1.png
+++ b/doc/integration/img/jira_dev_panel_jira_setup_1-1.png
Binary files differ
diff --git a/doc/integration/img/jira_dev_panel_setup_com_1.png b/doc/integration/img/jira_dev_panel_setup_com_1.png
index 906e4aa16cb..18f0d5da043 100644
--- a/doc/integration/img/jira_dev_panel_setup_com_1.png
+++ b/doc/integration/img/jira_dev_panel_setup_com_1.png
Binary files differ
diff --git a/doc/integration/img/jira_dev_panel_setup_com_2.png b/doc/integration/img/jira_dev_panel_setup_com_2.png
index 002a9140968..31dc13e1271 100644
--- a/doc/integration/img/jira_dev_panel_setup_com_2.png
+++ b/doc/integration/img/jira_dev_panel_setup_com_2.png
Binary files differ
diff --git a/doc/integration/img/jira_dev_panel_setup_com_3.png b/doc/integration/img/jira_dev_panel_setup_com_3.png
index c4e748c38cf..eb3c573a4bb 100644
--- a/doc/integration/img/jira_dev_panel_setup_com_3.png
+++ b/doc/integration/img/jira_dev_panel_setup_com_3.png
Binary files differ