summaryrefslogtreecommitdiff
path: root/doc/integration/gitlab.md
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-18 22:42:52 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-24 15:07:25 +0100
commit20691df230332022cb4d5008d84c7ee6e6c8dbfd (patch)
treee377d1fca356d11aed25767716991140a9f83add /doc/integration/gitlab.md
parent3fde1dce1f9058d4b57d17eac55051fb174c6aa4 (diff)
downloadgitlab-ce-20691df230332022cb4d5008d84c7ee6e6c8dbfd.tar.gz
Add Bitbucket integration docs.
Diffstat (limited to 'doc/integration/gitlab.md')
-rw-r--r--doc/integration/gitlab.md18
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index 87400bed5b5..49ffaa62af8 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -3,7 +3,7 @@
Import projects from GitLab.com and login to your GitLab instance with your GitLab.com account.
To enable the GitLab.com OmniAuth provider you must register your application with GitLab.com.
-GitLab.com will generate a application ID and secret key for you to use.
+GitLab.com will generate an application ID and secret key for you to use.
1. Sign in to GitLab.com
@@ -46,7 +46,7 @@ GitLab.com will generate a application ID and secret key for you to use.
sudo -u git -H editor config/gitlab.yml
```
-1. See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for inital settings.
+1. See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
1. Add the provider configuration:
@@ -56,8 +56,8 @@ GitLab.com will generate a application ID and secret key for you to use.
gitlab_rails['omniauth_providers'] = [
{
"name" => "gitlab",
- "app_id" => "YOUR APP ID",
- "app_secret" => "YOUR APP SECRET",
+ "app_id" => "YOUR_APP_ID",
+ "app_secret" => "YOUR_APP_SECRET",
"args" => { "scope" => "api" } }
}
]
@@ -66,14 +66,14 @@ GitLab.com will generate a application ID and secret key for you to use.
For installations from source:
```
- - { name: 'gitlab', app_id: 'YOUR APP ID',
- app_secret: 'YOUR APP SECRET',
+ - { name: 'gitlab', app_id: 'YOUR_APP_ID',
+ app_secret: 'YOUR_APP_SECRET',
args: { scope: 'api' } }
```
-1. Change 'YOUR APP ID' to the Application ID from the GitLab application page.
+1. Change 'YOUR_APP_ID' to the Application ID from the GitLab.com application page.
-1. Change 'YOUR APP SECRET' to the secret from the GitLab application page.
+1. Change 'YOUR_APP_SECRET' to the secret from the GitLab.com application page.
1. Save the configuration file.
@@ -81,4 +81,4 @@ GitLab.com will generate a application ID and secret key for you to use.
On the sign in page there should now be a GitLab.com icon below the regular sign in form.
Click the icon to begin the authentication process. GitLab.com will ask the user to sign in and authorize the GitLab application.
-If everything goes well the user will be returned to your GitLab instance and will be signed in.
+If everything goes well the user will be returned to your GitLab instance and will be signed in. \ No newline at end of file