summaryrefslogtreecommitdiff
path: root/app/workers/merge_worker.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/workers/merge_worker.rb')
-rw-r--r--app/workers/merge_worker.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
index 48e2da338f6..c3b58df92c1 100644
--- a/app/workers/merge_worker.rb
+++ b/app/workers/merge_worker.rb
@@ -7,6 +7,8 @@ class MergeWorker
current_user = User.find(current_user_id)
merge_request = MergeRequest.find(merge_request_id)
+ merge_request.update_column(:merge_jid, jid)
+
MergeRequests::MergeService.new(merge_request.target_project, current_user, params)
.execute(merge_request)
end