summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 03:07:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 03:07:43 +0000
commitdddde902acfa6acfb11583c61faa67cc7c8d11b6 (patch)
tree2e9fdf963c84f82995d62d0c55f91168cff3ec47 /doc/integration
parent101c30f4dffc624af3cbe3f12edc2cfee570a5f3 (diff)
downloadgitlab-ce-dddde902acfa6acfb11583c61faa67cc7c8d11b6.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/salesforce.md2
-rw-r--r--doc/integration/vault.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index 60d6274cfce..40c44c974cc 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -631,7 +631,7 @@ Here are some common pitfalls and how to overcome them:
Gitlab::Elastic::Indexer::Error: time="2020-01-23T09:13:00Z" level=fatal msg="health check timeout: no Elasticsearch node available"
```
- You probably have not used either `http://` or `https://` as part of your value in the **"URL"** field of the Elasticseach Integration Menu. Please make sure you are using either `http://` or `https://` in this field as the [Elasticsearch client for Go](https://github.com/olivere/elastic) that we are using [needs the prefix for the URL to be acceped as valid](https://github.com/olivere/elastic/commit/a80af35aa41856dc2c986204e2b64eab81ccac3a).
+ You probably have not used either `http://` or `https://` as part of your value in the **"URL"** field of the Elasticseach Integration Menu. Please make sure you are using either `http://` or `https://` in this field as the [Elasticsearch client for Go](https://github.com/olivere/elastic) that we are using [needs the prefix for the URL to be accepted as valid](https://github.com/olivere/elastic/commit/a80af35aa41856dc2c986204e2b64eab81ccac3a).
Once you have corrected the formatting of the URL, delete the index (via the [dedicated rake task](#gitlab-elasticsearch-rake-tasks)) and [reindex the content of your instance](#adding-gitlabs-data-to-the-elasticsearch-index).
### Reverting to basic search
diff --git a/doc/integration/salesforce.md b/doc/integration/salesforce.md
index 5272e9fd5e5..64eac2f9e66 100644
--- a/doc/integration/salesforce.md
+++ b/doc/integration/salesforce.md
@@ -23,7 +23,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must [create
- **Callback URL**: The callback URL of your GitLab installation. For example, `https://gitlab.example.com/users/auth/salesforce/callback`.
- **Selected OAuth Scopes**: Move **Access your basic information (id, profile, email, address, phone)** and **Allow access to your unique identifier (OpenID)** to the right column.
- ![Salesforce Oauth App Details](img/salesforce_oauth_app_details.png)
+ ![Salesforce OAuth App Details](img/salesforce_oauth_app_details.png)
1. Click **Save**.
diff --git a/doc/integration/vault.md b/doc/integration/vault.md
index c216fdfca4a..b1cc89e736d 100644
--- a/doc/integration/vault.md
+++ b/doc/integration/vault.md
@@ -103,7 +103,7 @@ The following assumes you already have Vault installed and running.
vault login -method=oidc port=8250 role=demo
```
- Here is a short explaination of what this command does:
+ Here is a short explanation of what this command does:
1. In the **Write the OIDC Role Config** (step 4), we created a role called `demo`. We set `role=demo` so Vault knows which configuration we'd like to login in with.
1. To set Vault to use the `OIDC` sign-in method, we set `-method=oidc`.