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
Jérome Perrin
gitlab-ce
Commits
c47183d7
Commit
c47183d7
authored
Apr 26, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for review of GitHub Enterprise backport changes
parent
eede0323
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+3
-3
doc/integration/github.md
doc/integration/github.md
+1
-1
No files found.
config/initializers/1_settings.rb
View file @
c47183d7
...
...
@@ -143,7 +143,7 @@ Settings.omniauth.session_tickets['cas3'] = 'ticket'
# Fill out omniauth-gitlab settings. It is needed for easy set up GHE or GH by just specifying url.
github_default_url
=
"https://github.com"
github_settings
=
Settings
.
omniauth
[
'providers'
].
find
{
|
provider
|
provider
[
"name"
]
==
"github"
}
github_settings
=
Settings
.
omniauth
[
'providers'
].
find
{
|
provider
|
provider
[
"name"
]
==
"github"
}
if
github_settings
# For compatibility with old config files (before 7.8)
...
...
@@ -158,9 +158,9 @@ if github_settings
github_settings
[
"args"
][
"client_options"
]
=
OmniAuth
::
Strategies
::
GitHub
.
default_options
[
:client_options
]
else
github_settings
[
"args"
][
"client_options"
]
=
{
"site"
=>
File
.
join
(
github_settings
[
"url"
],
"api/v3"
),
"site"
=>
File
.
join
(
github_settings
[
"url"
],
"api/v3"
),
"authorize_url"
=>
File
.
join
(
github_settings
[
"url"
],
"login/oauth/authorize"
),
"token_url"
=>
File
.
join
(
github_settings
[
"url"
],
"login/oauth/access_token"
)
"token_url"
=>
File
.
join
(
github_settings
[
"url"
],
"login/oauth/access_token"
)
}
end
end
...
...
doc/integration/github.md
View file @
c47183d7
...
...
@@ -78,7 +78,7 @@ GitHub will generate an application ID and secret key for you to use.
args: { scope: 'user:email' } }
```
__Replace `https://github.example.com/` with your GitHub URL__
__Replace `https://github.example.com/` with your GitHub URL
.
__
1.
Change 'YOUR_APP_ID' to the client ID from the GitHub application page from step 7.
...
...
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