diff options
author | James Lopez <james@jameslopez.es> | 2016-03-22 20:03:54 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-03-22 20:03:54 +0300 |
commit | c136edbbe343cbb54f135928db5d901c1cb65c4f (patch) | |
tree | ef95bebb69cfe4fc31e1ff53c389e5f0afd270a1 /lib/gitlab/gitlab_import | |
parent | 8aafe685837d12b623f70eec86cae6e7cef9a849 (diff) |
fix gitlab import and spec
Diffstat (limited to 'lib/gitlab/gitlab_import')
-rw-r--r-- | lib/gitlab/gitlab_import/importer.rb | 11 | ||||
-rw-r--r-- | lib/gitlab/gitlab_import/project_creator.rb | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb index 850b73244c6..afc06d01ebd 100644 --- a/lib/gitlab/gitlab_import/importer.rb +++ b/lib/gitlab/gitlab_import/importer.rb @@ -5,10 +5,13 @@ module Gitlab def initialize(project) @project = project - import_data = project.import_data.try(:data) - gitlab_session = import_data["gitlab_session"] if import_data - @client = Client.new(gitlab_session["gitlab_access_token"]) - @formatter = Gitlab::ImportFormatter.new + credentials = import_data.credentials + if credentials && credentials["password"] + @client = Client.new(credentials["password"]) + @formatter = Gitlab::ImportFormatter.new + else + raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}" + end end def execute diff --git a/lib/gitlab/gitlab_import/project_creator.rb b/lib/gitlab/gitlab_import/project_creator.rb index 7baaadb813c..77c33db4b59 100644 --- a/lib/gitlab/gitlab_import/project_creator.rb +++ b/lib/gitlab/gitlab_import/project_creator.rb @@ -23,7 +23,6 @@ module Gitlab import_url: repo["http_url_to_repo"].sub("://", "://oauth2:#{@session_data[:gitlab_access_token]}@") ).execute - project.create_import_data(data: { "gitlab_session" => session_data } ) project end end |