summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-26 11:25:35 +0200
committerJames Lopez <james@jameslopez.es>2016-05-26 11:25:35 +0200
commitbf484ffee458023ba890e64fbd314ad45ece9ba8 (patch)
tree8bdb3faeda24e5b73df0e720060b1473a03152cc /lib
parentadc64e4583dc42399f681a9b17490f98b8c4bec0 (diff)
downloadgitlab-ce-bf484ffee458023ba890e64fbd314ad45ece9ba8.tar.gz
fix bad refactoring of import data credentials
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/gitlab_import/importer.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index 3e51c06877e..e32ef8a44c2 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -5,9 +5,9 @@ module Gitlab
def initialize(project)
@project = project
- credentials = project.import_data
- if credentials && credentials[:password]
- @client = Client.new(credentials[:password])
+ import_data = project.import_data
+ if import_data && import_data.credentials && import_data.credentials[:password]
+ @client = Client.new(import_data.credentials[:password])
@formatter = Gitlab::ImportFormatter.new
else
raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}"