diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-04 12:02:46 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-04 12:02:46 +0300 |
| commit | 5714e57b1338ed2b1893b85d31e6119102de1859 (patch) | |
| tree | 09128e2e1e9deb535c9d1e150917fc26e6cdebb4 /doc | |
| parent | 60734fb06fbf9996f16db3541c32622a56d76aa4 (diff) | |
| parent | b1e0a9aba519955945614494cbca7cd5e02d581d (diff) | |
Merge branch 'patch-28' into 'master'
Fix typo and formatting
See merge request gitlab-org/gitlab-ce!20352
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/integration/google.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/google.md b/doc/integration/google.md index 8906f91b6b4..73e2f5826ff 100644 --- a/doc/integration/google.md +++ b/doc/integration/google.md @@ -30,7 +30,7 @@ In Google's side: ``` https://gitlab.example.com/users/auth/google_oauth2/callback - https://gitlab.exampl.com/-/google_api/auth/callback + https://gitlab.example.com/-/google_api/auth/callback ``` 1. You should now be able to see a Client ID and Client secret. Note them down @@ -77,7 +77,7 @@ On your GitLab server: For installations from source: - ``` + ```yaml - { name: 'google_oauth2', app_id: 'YOUR_APP_ID', app_secret: 'YOUR_APP_SECRET', args: { access_type: 'offline', approval_prompt: '' } } |