summaryrefslogtreecommitdiff
path: root/doc/integration/google.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/google.md
parent3fde1dce1f9058d4b57d17eac55051fb174c6aa4 (diff)
downloadgitlab-ce-20691df230332022cb4d5008d84c7ee6e6c8dbfd.tar.gz
Add Bitbucket integration docs.
Diffstat (limited to 'doc/integration/google.md')
-rw-r--r--doc/integration/google.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/integration/google.md b/doc/integration/google.md
index 168077c2770..d7b741ece69 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -43,7 +43,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
sudo -u git -H editor config/gitlab.yml
```
-1. See [Initial OmniAuth Configuration](README.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:
@@ -53,8 +53,8 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
gitlab_rails['omniauth_providers'] = [
{
"name" => "google_oauth2",
- "app_id" => "YOUR APP ID",
- "app_secret" => "YOUR APP SECRET",
+ "app_id" => "YOUR_APP_ID",
+ "app_secret" => "YOUR_APP_SECRET",
"args" => { "access_type" => "offline", "approval_prompt" => '' } }
}
]
@@ -63,14 +63,14 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
For installations from source:
```
- - { name: 'google_oauth2', app_id: 'YOUR APP ID',
- app_secret: 'YOUR APP SECRET',
+ - { name: 'google_oauth2', app_id: 'YOUR_APP_ID',
+ app_secret: 'YOUR_APP_SECRET',
args: { access_type: 'offline', approval_prompt: '' } }
```
-1. Change 'YOUR APP ID' to the client ID from the Google Developer page from step 10.
+1. Change 'YOUR_APP_ID' to the client ID from the Google Developer page from step 10.
-1. Change 'YOUR APP SECRET' to the client secret from the Google Developer page from step 10.
+1. Change 'YOUR_APP_SECRET' to the client secret from the Google Developer page from step 10.
1. Save the configuration file.