mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-26 21:16:06 +10:00
fixing a few issues after testing imports
This commit is contained in:
@@ -22,8 +22,11 @@ module Gitlab
|
||||
import_source: "#{repo["owner"]}/#{repo["slug"]}",
|
||||
import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git",
|
||||
).execute
|
||||
|
||||
import_data = project.import_data
|
||||
import_data.credentials.merge!("bb_session" => session_data)
|
||||
import_data.save
|
||||
|
||||
project
|
||||
end
|
||||
end
|
||||
|
||||
@@ -24,13 +24,10 @@ module Gitlab
|
||||
import_url: Project::UNKNOWN_IMPORT_URL
|
||||
).execute
|
||||
|
||||
project.create_import_data(
|
||||
credentials: {
|
||||
'repo' => repo.raw_data,
|
||||
'user_map' => user_map,
|
||||
'fb_session' => fb_session
|
||||
}
|
||||
)
|
||||
import_data = project.import_data
|
||||
import_data.credentials.merge!('fb_session' => fb_session)
|
||||
import_data.data = { 'repo' => repo.raw_data, 'user_map' => user_map }
|
||||
import_data.save
|
||||
|
||||
project
|
||||
end
|
||||
|
||||
@@ -24,12 +24,9 @@ module Gitlab
|
||||
import_url: repo.import_url
|
||||
).execute
|
||||
|
||||
project.create_import_data(
|
||||
data: {
|
||||
"repo" => repo.raw_data,
|
||||
"user_map" => user_map
|
||||
}
|
||||
)
|
||||
import_data = project.import_data
|
||||
import_data.data = { 'repo' => repo.raw_data, 'user_map' => user_map }
|
||||
import_data.save
|
||||
|
||||
project
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user