Commit 5714e57b authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'patch-28' into 'master'

Fix typo and formatting

See merge request gitlab-org/gitlab-ce!20352
parents 60734fb0 b1e0a9ab
...@@ -30,7 +30,7 @@ In Google's side: ...@@ -30,7 +30,7 @@ In Google's side:
``` ```
https://gitlab.example.com/users/auth/google_oauth2/callback 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 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: ...@@ -77,7 +77,7 @@ On your GitLab server:
For installations from source: For installations from source:
``` ```yaml
- { name: 'google_oauth2', app_id: 'YOUR_APP_ID', - { name: 'google_oauth2', app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET', app_secret: 'YOUR_APP_SECRET',
args: { access_type: 'offline', approval_prompt: '' } } args: { access_type: 'offline', approval_prompt: '' } }
......
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