diff options
author | Stan Hu <stanhu@gmail.com> | 2018-07-30 23:37:54 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-07-30 23:37:54 -0700 |
commit | 3cda8c93d879282af2ab5b21ca2d89daf0238f17 (patch) | |
tree | 494ce2da69553ab6dfc41257bcc9feae3726fb42 /lib/gitlab/bitbucket_server_import | |
parent | 7c88c4af0e31081b4137bc1b93e40d22ef6a93c6 (diff) | |
download | gitlab-ce-3cda8c93d879282af2ab5b21ca2d89daf0238f17.tar.gz |
Fix merge request SHA
Diffstat (limited to 'lib/gitlab/bitbucket_server_import')
-rw-r--r-- | lib/gitlab/bitbucket_server_import/importer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb index a96dd260221..d956968c013 100644 --- a/lib/gitlab/bitbucket_server_import/importer.rb +++ b/lib/gitlab/bitbucket_server_import/importer.rb @@ -197,7 +197,6 @@ module Gitlab updated_at: pull_request.updated_at } - attributes[:merge_commit_sha] = target_branch_sha if pull_request.merged? merge_request = project.merge_requests.create!(attributes) import_pull_request_comments(pull_request, merge_request) if merge_request.persisted? end @@ -219,6 +218,7 @@ module Gitlab user_id = gitlab_user_id(committer) timestamp = merge_event.merge_timestamp + merge_request.update_attributes({ merge_commit_sha: merge_event.merge_commit }) metric = MergeRequest::Metrics.find_or_initialize_by(merge_request: merge_request) metric.update(merged_by_id: user_id, merged_at: timestamp) end |