diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-10 18:01:01 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-28 15:48:09 -0300 |
| commit | 4f17c6b7633c65a9d51dbcd9193914013707e226 (patch) | |
| tree | 8c4523f15e7b40a9b7852cc5413669144370f263 /app/workers | |
| parent | d7f61bae8b498a09180bb7e782a687ae2d0c3bae (diff) | |
| download | gitlab-ce-4f17c6b7633c65a9d51dbcd9193914013707e226.tar.gz | |
Track enqueued and ongoing MRs
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/merge_worker.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb index c3b58df92c1..48e2da338f6 100644 --- a/app/workers/merge_worker.rb +++ b/app/workers/merge_worker.rb @@ -7,8 +7,6 @@ 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 |