diff options
| author | Evan Read <eread@gitlab.com> | 2019-05-12 18:57:43 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-05-14 19:30:48 +0300 |
| commit | 1225d14256b41dabcd4d746d82c2641be5048dbf (patch) | |
| tree | 2f652d1266a2229e1e75db9b1903c295634036f1 | |
| parent | cad67f10ba500165a80aa3451c28bf1b09d6b320 (diff) | |
Merge branch 'docs-update-salesforce-documentation' into 'master'
Docs: Fix wording error in salesforce section
See merge request gitlab-org/gitlab-ce!28190
(cherry picked from commit 74511b049743cf543694bb92a8acd7e7586e533d)
a0ecc3ed Fix wording error
268defdf Fix wording in salesforce docs
| -rw-r--r-- | doc/integration/salesforce.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/integration/salesforce.md b/doc/integration/salesforce.md index 18d42486fd6..8a99641a256 100644 --- a/doc/integration/salesforce.md +++ b/doc/integration/salesforce.md @@ -1,15 +1,15 @@ # SalesForce OmniAuth Provider -You can integrate your GitLab instance with [SalesForce](https://www.salesforce.com/) to enable users to login to your GitLab instance with their SalesForce account. +You can integrate your GitLab instance with [SalesForce](https://www.salesforce.com/) to enable users to login to your GitLab instance with their SalesForce account. ## Create SalesForce Application To enable SalesForce OmniAuth provider, you must use SalesForce's credentials for your GitLab instance. -To get the credentials (a pair of Client ID and Client Secret), you must register an application on UltraAuth. +To get the credentials (a pair of Client ID and Client Secret), you must register an application on SalesForces. 1. Sign in to [SalesForce](https://www.salesforce.com/). -1. Navigate to **Platform Tools/Apps** and click on **New Connected App**. +1. Navigate to **Platform Tools/Apps/App Manager** and click on **New Connected App**. 1. Fill in the application details into the following fields: - **Connected App Name** and **API Name**: Set to any value but consider something like `<Organization>'s GitLab`, `<Your Name>'s GitLab`, or something else that is descriptive. @@ -64,7 +64,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe } ``` 1. Change `SALESFORCE_CLIENT_ID` to the Consumer Key from the SalesForce connected application page. -1. Change `SALESFORCE_CLIENT_SECRET` to the Client Secret from the SalesForce connected application page. +1. Change `SALESFORCE_CLIENT_SECRET` to the Consumer Secret from the SalesForce connected application page.  1. Save the configuration file. |