diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-20 12:22:14 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-20 12:22:14 +0300 |
| commit | 4f09d099e9fa29659917f87c2dc25f2b9aa05b5e (patch) | |
| tree | a70a9b3d42c8d3762974d354b31aa611590f55b8 /app/workers | |
| parent | 135437b70d5bf12fff17d10adeae0c459b779138 (diff) | |
| parent | 181cd299f9e06223e8338e93b1c318c671ccb1aa (diff) | |
Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'
Adds Rubocop rule for line break after guard clause
Closes #18040
See merge request gitlab-org/gitlab-ce!15188
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/irker_worker.rb | 1 | ||||
| -rw-r--r-- | app/workers/stuck_ci_jobs_worker.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/workers/irker_worker.rb b/app/workers/irker_worker.rb index 3dd14466994..311fc187e49 100644 --- a/app/workers/irker_worker.rb +++ b/app/workers/irker_worker.rb @@ -104,6 +104,7 @@ class IrkerWorker parents = commit.parents # Return old value if there's no new one return push_data['before'] if parents.empty? + # Or return the first parent-commit parents[0].id end diff --git a/app/workers/stuck_ci_jobs_worker.rb b/app/workers/stuck_ci_jobs_worker.rb index 269776a1f62..fdbc049c2df 100644 --- a/app/workers/stuck_ci_jobs_worker.rb +++ b/app/workers/stuck_ci_jobs_worker.rb @@ -39,6 +39,7 @@ class StuckCiJobsWorker def drop_stuck(status, timeout) search(status, timeout) do |build| return unless build.stuck? + drop_build :stuck, build, status, timeout end end |