Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5714e57b
Commit
5714e57b
authored
Jul 04, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-28' into 'master'
Fix typo and formatting See merge request gitlab-org/gitlab-ce!20352
parents
60734fb0
b1e0a9ab
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
doc/integration/google.md
doc/integration/google.md
+2
-2
No files found.
doc/integration/google.md
View file @
5714e57b
...
@@ -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.exampl
e
.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: '' } }
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment