diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-08 04:47:48 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-08 04:47:48 +0300 |
| commit | fd40bce9ccad94c3f8fe522a51a771335d95539f (patch) | |
| tree | 0fb76c147480326f17fb77271628c24794255572 /app/workers/merge_worker.rb | |
| parent | 4490af8cf22416f12c8cf2e00f8b7c293be08167 (diff) | |
| parent | a0c22d1edafbd87d59dbf01acd610da97ec87912 (diff) | |
Merge branch '31207-clean-locked-merge-requests' into 'master'
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"
Closes #31207
See merge request !13207
Diffstat (limited to 'app/workers/merge_worker.rb')
| -rw-r--r-- | app/workers/merge_worker.rb | 2 |
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 |