diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-01 18:27:07 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-01 18:27:07 +0300 |
| commit | 255cd31652f1afda5cd1c075526bbe3ee56a708e (patch) | |
| tree | 954ec1b98008489e7c73ff79bf1acf634a27f92c /lib | |
| parent | 6aeb753ba81c857c23d29f9d4c5e22aaeed737dc (diff) | |
fixes after more import testing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/bitbucket_import/client.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/gitlab_import/importer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_import/client.rb b/lib/gitlab/bitbucket_import/client.rb index 1d1bd5e3216..acd0f298b3d 100644 --- a/lib/gitlab/bitbucket_import/client.rb +++ b/lib/gitlab/bitbucket_import/client.rb @@ -6,7 +6,7 @@ module Gitlab attr_reader :consumer, :api def self.from_project(project) - credentials = project.import_data.credentials if project.import_data + credentials = project.import_data.stringified_credentials if project.import_data if defined?(credentials) && credentials['bb_session'] token = credentials['bb_session']['bitbucket_access_token'] token_secret = credentials['bb_session']['bitbucket_access_token_secret'] diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb index afc06d01ebd..19dc79462c0 100644 --- a/lib/gitlab/gitlab_import/importer.rb +++ b/lib/gitlab/gitlab_import/importer.rb @@ -5,7 +5,7 @@ module Gitlab def initialize(project) @project = project - credentials = import_data.credentials + credentials = import_data.stringified_credentials if credentials && credentials["password"] @client = Client.new(credentials["password"]) @formatter = Gitlab::ImportFormatter.new |