diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-03-22 18:07:33 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-03-22 18:16:48 -0700 |
| commit | 5cce0645b07265e3c2b991bcbff351a9acbc90d6 (patch) | |
| tree | d6159107f168a25bb737903c214e106321cf7cab /lib/gitlab/bitbucket_import | |
| parent | fb30039668f68834d9951746181201423fa8b269 (diff) | |
| download | gitlab-ce-5cce0645b07265e3c2b991bcbff351a9acbc90d6.tar.gz | |
Fix OAuth2 issue importing a new project from GitHub and GitLab
Closes #1268
Diffstat (limited to 'lib/gitlab/bitbucket_import')
| -rw-r--r-- | lib/gitlab/bitbucket_import/client.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_import/client.rb b/lib/gitlab/bitbucket_import/client.rb index 1e4906c9e31..5b1952b9675 100644 --- a/lib/gitlab/bitbucket_import/client.rb +++ b/lib/gitlab/bitbucket_import/client.rb @@ -62,7 +62,7 @@ module Gitlab 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 @@ module Gitlab end def bitbucket_options - OmniAuth::Strategies::Bitbucket.default_options[:client_options].dup + OmniAuth::Strategies::Bitbucket.default_options[:client_options].symbolize_keys end end end |