Commit c93570d8 authored by James Lopez's avatar James Lopez

fixing a few issues after testing imports

parent 28df200c
...@@ -22,8 +22,11 @@ module Gitlab ...@@ -22,8 +22,11 @@ module Gitlab
import_source: "#{repo["owner"]}/#{repo["slug"]}", import_source: "#{repo["owner"]}/#{repo["slug"]}",
import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git", import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git",
).execute ).execute
import_data = project.import_data import_data = project.import_data
import_data.credentials.merge!("bb_session" => session_data) import_data.credentials.merge!("bb_session" => session_data)
import_data.save
project project
end end
end end
......
...@@ -24,13 +24,10 @@ module Gitlab ...@@ -24,13 +24,10 @@ module Gitlab
import_url: Project::UNKNOWN_IMPORT_URL import_url: Project::UNKNOWN_IMPORT_URL
).execute ).execute
project.create_import_data( import_data = project.import_data
credentials: { import_data.credentials.merge!('fb_session' => fb_session)
'repo' => repo.raw_data, import_data.data = { 'repo' => repo.raw_data, 'user_map' => user_map }
'user_map' => user_map, import_data.save
'fb_session' => fb_session
}
)
project project
end end
......
...@@ -24,12 +24,9 @@ module Gitlab ...@@ -24,12 +24,9 @@ module Gitlab
import_url: repo.import_url import_url: repo.import_url
).execute ).execute
project.create_import_data( import_data = project.import_data
data: { import_data.data = { 'repo' => repo.raw_data, 'user_map' => user_map }
"repo" => repo.raw_data, import_data.save
"user_map" => user_map
}
)
project project
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment