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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
410c8024
Commit
410c8024
authored
9 years ago
by
Robert Schilling
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8938 from kcyeu/master
Fix invalid config examples in OmniAuth docs
parents
8b551ee3
fc64b3f7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
doc/integration/github.md
doc/integration/github.md
+2
-2
doc/integration/gitlab.md
doc/integration/gitlab.md
+2
-2
doc/integration/google.md
doc/integration/google.md
+1
-1
No files found.
doc/integration/github.md
View file @
410c8024
...
@@ -53,7 +53,7 @@ GitHub will generate an application ID and secret key for you to use.
...
@@ -53,7 +53,7 @@ GitHub will generate an application ID and secret key for you to use.
"app_id" => "YOUR_APP_ID",
"app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET",
"app_secret" => "YOUR_APP_SECRET",
"url" => "https://github.com/",
"url" => "https://github.com/",
"args" => { "scope" => "user:email" }
}
"args" => { "scope" => "user:email" }
}
}
]
]
```
```
...
@@ -76,4 +76,4 @@ GitHub will generate an application ID and secret key for you to use.
...
@@ -76,4 +76,4 @@ GitHub will generate an application ID and secret key for you to use.
On the sign in page there should now be a GitHub icon below the regular sign in form.
On the sign in page there should now be a GitHub icon below the regular sign in form.
Click the icon to begin the authentication process. GitHub will ask the user to sign in and authorize the GitLab application.
Click the icon to begin the authentication process. GitHub will ask the user to sign in and authorize the GitLab application.
If everything goes well the user will be returned to GitLab and will be signed in.
If everything goes well the user will be returned to GitLab and will be signed in.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
doc/integration/gitlab.md
View file @
410c8024
...
@@ -58,7 +58,7 @@ GitLab.com will generate an application ID and secret key for you to use.
...
@@ -58,7 +58,7 @@ GitLab.com will generate an application ID and secret key for you to use.
"name" => "gitlab",
"name" => "gitlab",
"app_id" => "YOUR_APP_ID",
"app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET",
"app_secret" => "YOUR_APP_SECRET",
"args" => { "scope" => "api" }
}
"args" => { "scope" => "api" }
}
}
]
]
```
```
...
@@ -81,4 +81,4 @@ GitLab.com will generate an application ID and secret key for you to use.
...
@@ -81,4 +81,4 @@ GitLab.com will generate an 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.
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.
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
This diff is collapsed.
Click to expand it.
doc/integration/google.md
View file @
410c8024
...
@@ -55,7 +55,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
...
@@ -55,7 +55,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
"name" => "google_oauth2",
"name" => "google_oauth2",
"app_id" => "YOUR_APP_ID",
"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" => '' }
}
}
]
]
```
```
...
...
This diff is collapsed.
Click to expand it.
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