diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-01 09:42:57 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-01 09:42:57 +0300 |
| commit | ef3ebed6d3d3910bdf6080d6304ee7c5d5b0cc87 (patch) | |
| tree | 845aef39c7280c2e22104a91170644c15643a456 /app/workers | |
| parent | 253bf69dda460869741bc6c9d864c789055b8013 (diff) | |
| parent | 0134079430f0179c527d388539c0986352bca9bd (diff) | |
Merge branch 'master' into refactor-clusters
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 |