diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-01 01:54:32 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-08-01 01:54:32 +0300 |
| commit | 7704404335814b39922d32eacf6b6f0961b9820f (patch) | |
| tree | d55a66d949bbe86bfc2426568b783748e35ea26c /lib | |
| parent | db4ff688da690f3b7c182e5e9f4f9146518c1d69 (diff) | |
Revert "Remove unnecessary lookup for merge request SHAs"
This reverts commit a9d359b48463c2a77529b9a5f289f9d1abf45484.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index a6514b621f4..f3999e690fa 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -149,16 +149,21 @@ module Gitlab description += @formatter.author_line(pull_request.author) unless find_user_id(pull_request.author) description += pull_request.description + source_branch_sha = pull_request.source_branch_sha + 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 + merge_request = project.merge_requests.create!( iid: pull_request.iid, title: pull_request.title, description: description, source_project: project, source_branch: pull_request.source_branch_name, - source_branch_sha: pull_request.source_branch_sha, + source_branch_sha: source_branch_sha, target_project: project, target_branch: pull_request.target_branch_name, - target_branch_sha: pull_request.target_branch_sha, + target_branch_sha: target_branch_sha, state: pull_request.state, author_id: gitlab_user_id(project, pull_request.author), assignee_id: nil, |