diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-15 15:36:18 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-15 15:36:18 -0700 |
| commit | 57c9a89313ff4fbaaf50e434ef37e956d0e80d0e (patch) | |
| tree | 6a318e777eb77752d01efe6df22ba3fe08962d37 /lib/gitlab/bitbucket_server_import/importer.rb | |
| parent | eb482bfa59aacaa92f801ed9a38b8778f23a028e (diff) | |
| download | gitlab-ce-57c9a89313ff4fbaaf50e434ef37e956d0e80d0e.tar.gz | |
Fix assorted bugs and write spec for importing merge event
Diffstat (limited to 'lib/gitlab/bitbucket_server_import/importer.rb')
| -rw-r--r-- | lib/gitlab/bitbucket_server_import/importer.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb index cc21e7aad9e..36069f0f168 100644 --- a/lib/gitlab/bitbucket_server_import/importer.rb +++ b/lib/gitlab/bitbucket_server_import/importer.rb @@ -163,6 +163,8 @@ module Gitlab target_branch_sha = pull_request.target_branch_sha source_branch_sha = project.repository.commit(source_branch_sha)&.sha || source_branch_sha target_branch_sha = project.repository.commit(target_branch_sha)&.sha || target_branch_sha + author = gitlab_user_id(project, pull_request.author_email) || User.ghost + project.merge_requests.find_by(iid: pull_request.iid)&.destroy attributes = { @@ -176,7 +178,7 @@ module Gitlab target_branch: Gitlab::Git.ref_name(pull_request.target_branch_name), target_branch_sha: target_branch_sha, state: pull_request.state, - author_id: gitlab_user_id(project, pull_request.author_email), + author_id: author.id, assignee_id: nil, created_at: pull_request.created_at, updated_at: pull_request.updated_at @@ -202,8 +204,8 @@ module Gitlab def import_merge_event(merge_request, merge_event) committer = merge_event.committer_email - user = User.ghost - user ||= find_user_id(committer) if committer + user = find_user_id(committer) if committer + user ||= User.ghost timestamp = merge_event.merge_timestamp metric = MergeRequest::Metrics.find_or_initialize_by(merge_request: merge_request) metric.update_attributes(merged_by: user, merged_at: timestamp) |