Commit 74511b04 authored by Evan Read's avatar Evan Read

Merge branch 'docs-update-salesforce-documentation' into 'master'

Docs: Fix wording error in salesforce section

See merge request gitlab-org/gitlab-ce!28190
parents 168e93ac c312644f
...@@ -5,11 +5,11 @@ You can integrate your GitLab instance with [SalesForce](https://www.salesforce. ...@@ -5,11 +5,11 @@ You can integrate your GitLab instance with [SalesForce](https://www.salesforce.
## Create SalesForce Application ## Create SalesForce Application
To enable SalesForce OmniAuth provider, you must use SalesForce's credentials for your GitLab instance. 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. 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: 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. - **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 ...@@ -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_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.
![SalesForce App Secret Details](img/salesforce_app_secret_details.png) ![SalesForce App Secret Details](img/salesforce_app_secret_details.png)
1. Save the configuration file. 1. Save the configuration file.
......
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