diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-27 22:11:21 +0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-27 22:33:48 +0200 |
| commit | a6c52c4e593850eb270e5bfbd021cdfb56e6eed6 (patch) | |
| tree | 78a94e69c450dc157176102f119e1396a6523a18 /app/workers | |
| parent | dfd6c3f824ada5558546b809fd32468325788b94 (diff) | |
| download | gitlab-ce-a6c52c4e593850eb270e5bfbd021cdfb56e6eed6.tar.gz | |
Make merge_jid handling less stateful in MergeService
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/stuck_merge_jobs_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/stuck_merge_jobs_worker.rb b/app/workers/stuck_merge_jobs_worker.rb index 7843179d77c..a396c0f27b2 100644 --- a/app/workers/stuck_merge_jobs_worker.rb +++ b/app/workers/stuck_merge_jobs_worker.rb @@ -23,7 +23,7 @@ class StuckMergeJobsWorker merge_requests = MergeRequest.where(id: completed_ids) merge_requests.where.not(merge_commit_sha: nil).update_all(state: :merged) - merge_requests.where(merge_commit_sha: nil).update_all(state: :opened) + merge_requests.where(merge_commit_sha: nil).update_all(state: :opened, merge_jid: nil) Rails.logger.info("Updated state of locked merge jobs. JIDs: #{completed_jids.join(', ')}") end |