Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
1bd07d9fdec0
Commit
5cce0645
authored
Mar 22, 2015
by
Stan Hu
Browse files
Fix OAuth2 issue importing a new project from GitHub and GitLab
Closes #1268
parent
311a1448b214
Changes
7
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
1bd07d9f
...
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
- Fix "Import projects from" button to show the correct instructions (Stan Hu)
- Fix dots in Wiki slugs causing errors (Stan Hu)
- Fix OAuth2 issue importing a new project from GitHub and GitLab (Stan Hu)
- Update poltergeist to version 1.6.0 to support PhantomJS 2.0 (Zeger-Jan van de Weg)
- Fix cross references when usernames, milestones, or project names contain underscores (Stan Hu)
- Disable reference creation for comments surrounded by code/preformatted blocks (Stan Hu)
...
...
lib/gitlab/bitbucket_import/client.rb
View file @
1bd07d9f
...
...
@@ -62,7 +62,7 @@ def project(project_identifier)
end
def
find_deploy_key
(
project_identifier
,
key
)
JSON
.
parse
(
api
.
get
(
"/api/1.0/repositories/
#{
project_identifier
}
/deploy-keys"
).
body
).
find
do
|
deploy_key
|
JSON
.
parse
(
api
.
get
(
"/api/1.0/repositories/
#{
project_identifier
}
/deploy-keys"
).
body
).
find
do
|
deploy_key
|
deploy_key
[
"key"
].
chomp
==
key
.
chomp
end
end
...
...
@@ -92,7 +92,7 @@ def config
end
def
bitbucket_options
OmniAuth
::
Strategies
::
Bitbucket
.
default_options
[
:client_options
].
dup
OmniAuth
::
Strategies
::
Bitbucket
.
default_options
[
:client_options
].
symbolize_keys
end
end
end
...
...
lib/gitlab/github_import/client.rb
View file @
1bd07d9f
...
...
@@ -46,7 +46,7 @@ def config
end
def
github_options
OmniAuth
::
Strategies
::
GitHub
.
default_options
[
:client_options
].
dup
OmniAuth
::
Strategies
::
GitHub
.
default_options
[
:client_options
].
symbolize_keys
end
end
end
...
...
lib/gitlab/gitlab_import/client.rb
View file @
1bd07d9f
...
...
@@ -71,7 +71,7 @@ def config
end
def
gitlab_options
OmniAuth
::
Strategies
::
GitLab
.
default_options
[
:client_options
].
dup
OmniAuth
::
Strategies
::
GitLab
.
default_options
[
:client_options
].
symbolize_keys
end
end
end
...
...
spec/lib/gitlab/bitbucket_import/client_spec.rb
0 → 100644
View file @
1bd07d9f
require
'spec_helper'
describe
Gitlab
::
BitbucketImport
::
Client
do
let
(
:token
)
{
'123456'
}
let
(
:secret
)
{
'secret'
}
let
(
:client
)
{
Gitlab
::
BitbucketImport
::
Client
.
new
(
token
,
secret
)
}
before
do
Gitlab
.
config
.
omniauth
.
providers
<<
OpenStruct
.
new
(
app_id:
"asd123"
,
app_secret:
"asd123"
,
name:
"bitbucket"
)
end
it
'all OAuth client options are symbols'
do
client
.
consumer
.
options
.
keys
.
each
do
|
key
|
expect
(
key
).
to
be_kind_of
(
Symbol
)
end
end
end
spec/lib/gitlab/github_import/client_spec.rb
0 → 100644
View file @
1bd07d9f
require
'spec_helper'
describe
Gitlab
::
GithubImport
::
Client
do
let
(
:token
)
{
'123456'
}
let
(
:client
)
{
Gitlab
::
GithubImport
::
Client
.
new
(
token
)
}
before
do
Gitlab
.
config
.
omniauth
.
providers
<<
OpenStruct
.
new
(
app_id:
"asd123"
,
app_secret:
"asd123"
,
name:
"github"
)
end
it
'all OAuth2 client options are symbols'
do
client
.
client
.
options
.
keys
.
each
do
|
key
|
expect
(
key
).
to
be_kind_of
(
Symbol
)
end
end
end
spec/lib/gitlab/gitlab_import/client_spec.rb
0 → 100644
View file @
1bd07d9f
require
'spec_helper'
describe
Gitlab
::
GitlabImport
::
Client
do
let
(
:token
)
{
'123456'
}
let
(
:client
)
{
Gitlab
::
GitlabImport
::
Client
.
new
(
token
)
}
before
do
Gitlab
.
config
.
omniauth
.
providers
<<
OpenStruct
.
new
(
app_id:
"asd123"
,
app_secret:
"asd123"
,
name:
"gitlab"
)
end
it
'all OAuth2 client options are symbols'
do
client
.
client
.
options
.
keys
.
each
do
|
key
|
expect
(
key
).
to
be_kind_of
(
Symbol
)
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