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
5472ded2
Commit
5472ded2
authored
Aug 07, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix importing projects from GitHub Enterprise Edition.
parent
adbaa5c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
8 deletions
+5
-8
CHANGELOG-EE
CHANGELOG-EE
+1
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+2
-6
lib/gitlab/github_import/client.rb
lib/gitlab/github_import/client.rb
+2
-2
No files found.
CHANGELOG-EE
View file @
5472ded2
v 7.14
- Don't send "Added to group" notifications when group is LDAP synched
- Fix importing projects from GitHub Enterprise Edition.
v 7.13.2
- Fix group web hook
...
...
config/initializers/1_settings.rb
View file @
5472ded2
...
...
@@ -102,7 +102,7 @@ Settings.omniauth['providers'] ||= []
# 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)
...
...
@@ -112,11 +112,7 @@ if github_settings
end
if
github_settings
[
"url"
].
include?
(
github_default_url
)
github_settings
[
"args"
][
"client_options"
]
=
{
"site"
=>
'https://api.github.com/'
,
"authorize_url"
=>
'https://github.com/login/oauth/authorize'
,
"token_url"
=>
'https://github.com/login/oauth/access_token'
}
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"
),
...
...
lib/gitlab/github_import/client.rb
View file @
5472ded2
...
...
@@ -42,11 +42,11 @@ module Gitlab
private
def
config
Gitlab
.
config
.
omniauth
.
providers
.
find
{
|
provider
|
provider
.
name
==
"github"
}
Gitlab
.
config
.
omniauth
.
providers
.
find
{
|
provider
|
provider
.
name
==
"github"
}
end
def
github_options
OmniAuth
::
Strategies
::
GitHub
.
default_options
[
:client_options
].
symbolize_keys
config
[
"args"
][
"client_options"
].
deep_
symbolize_keys
end
end
end
...
...
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