diff options
author | James Lopez <james@jameslopez.es> | 2016-03-22 17:53:53 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-03-22 17:53:53 +0100 |
commit | 8aafe685837d12b623f70eec86cae6e7cef9a849 (patch) | |
tree | 2624e269085d65633c29f39e3ed765de8178ea5b /lib/gitlab/bitbucket_import/project_creator.rb | |
parent | 3b78885eac025b5cf90e1a370b7bbbbd88cc9727 (diff) | |
download | gitlab-ce-8aafe685837d12b623f70eec86cae6e7cef9a849.tar.gz |
first round of fixes and spec fixes
Diffstat (limited to 'lib/gitlab/bitbucket_import/project_creator.rb')
-rw-r--r-- | lib/gitlab/bitbucket_import/project_creator.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_import/project_creator.rb b/lib/gitlab/bitbucket_import/project_creator.rb index c9ccecef0c3..0e6f66de321 100644 --- a/lib/gitlab/bitbucket_import/project_creator.rb +++ b/lib/gitlab/bitbucket_import/project_creator.rb @@ -22,8 +22,8 @@ module Gitlab import_source: "#{repo["owner"]}/#{repo["slug"]}", import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git", ).execute - - project.create_import_data(credentials: { "bb_session" => session_data } ) + import_data = project.import_data + import_data.credentials.merge!("bb_session" => session_data) project end end |