diff options
author | Rémy Coutable <remy@rymai.me> | 2016-05-18 18:28:11 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-05-18 18:28:11 +0300 |
commit | f4d2a2d97b5f15b56b58b86eee7adf3cf37bc2a7 (patch) | |
tree | 458668e68d47e9064ced4fd68d0ca2b6873658dd /lib | |
parent | da8ac1635f1c12e9455e7517bee29678c754d492 (diff) | |
parent | 8eb67187d04f49f88afc13cdc3d0d591bb1e2a20 (diff) |
Merge branch 'fix/import-data-issue' into 'master'
Create import data in service and fix timing issues when scheduling job
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376
See merge request !4106
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/bitbucket_import/project_creator.rb | 7 | ||||
-rw-r--r-- | lib/gitlab/fogbugz_import/project_creator.rb | 9 | ||||
-rw-r--r-- | lib/gitlab/google_code_import/project_creator.rb | 9 |
3 files changed, 8 insertions, 17 deletions
diff --git a/lib/gitlab/bitbucket_import/project_creator.rb b/lib/gitlab/bitbucket_import/project_creator.rb index 941f818b847..b90ef0b0fba 100644 --- a/lib/gitlab/bitbucket_import/project_creator.rb +++ b/lib/gitlab/bitbucket_import/project_creator.rb @@ -11,7 +11,7 @@ module Gitlab end def execute - project = ::Projects::CreateService.new( + ::Projects::CreateService.new( current_user, name: repo["name"], path: repo["slug"], @@ -21,11 +21,8 @@ module Gitlab import_type: "bitbucket", import_source: "#{repo["owner"]}/#{repo["slug"]}", import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git", + import_data: { credentials: { bb_session: session_data } } ).execute - - project.create_or_update_import_data(credentials: { bb_session: session_data }) - - project end end end diff --git a/lib/gitlab/fogbugz_import/project_creator.rb b/lib/gitlab/fogbugz_import/project_creator.rb index 3840765db87..1918d5b208d 100644 --- a/lib/gitlab/fogbugz_import/project_creator.rb +++ b/lib/gitlab/fogbugz_import/project_creator.rb @@ -12,7 +12,7 @@ module Gitlab end def execute - project = ::Projects::CreateService.new( + ::Projects::CreateService.new( current_user, name: repo.safe_name, path: repo.path, @@ -21,12 +21,9 @@ module Gitlab visibility_level: Gitlab::VisibilityLevel::INTERNAL, import_type: 'fogbugz', import_source: repo.name, - import_url: Project::UNKNOWN_IMPORT_URL + import_url: Project::UNKNOWN_IMPORT_URL, + import_data: { data: { 'repo' => repo.raw_data, 'user_map' => user_map }, credentials: { fb_session: fb_session } } ).execute - - project.create_or_update_import_data(data: { 'repo' => repo.raw_data, 'user_map' => user_map }, credentials: { fb_session: fb_session }) - - project end end end diff --git a/lib/gitlab/google_code_import/project_creator.rb b/lib/gitlab/google_code_import/project_creator.rb index 0abb7a64c17..326cfcaa8af 100644 --- a/lib/gitlab/google_code_import/project_creator.rb +++ b/lib/gitlab/google_code_import/project_creator.rb @@ -11,7 +11,7 @@ module Gitlab end def execute - project = ::Projects::CreateService.new( + ::Projects::CreateService.new( current_user, name: repo.name, path: repo.name, @@ -21,12 +21,9 @@ module Gitlab visibility_level: Gitlab::VisibilityLevel::PUBLIC, import_type: "google_code", import_source: repo.name, - import_url: repo.import_url + import_url: repo.import_url, + import_data: { data: { 'repo' => repo.raw_data, 'user_map' => user_map } } ).execute - - project.create_or_update_import_data(data: { 'repo' => repo.raw_data, 'user_map' => user_map }) - - project end end end |