diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/services/ci/after_requeue_job_service.rb | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/services/ci/after_requeue_job_service.rb')
| -rw-r--r-- | app/services/ci/after_requeue_job_service.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/app/services/ci/after_requeue_job_service.rb b/app/services/ci/after_requeue_job_service.rb index f717dd0862c..9101ae91967 100644 --- a/app/services/ci/after_requeue_job_service.rb +++ b/app/services/ci/after_requeue_job_service.rb @@ -10,16 +10,9 @@ module Ci private def process_subsequent_jobs(processable) - if Feature.enabled?(:ci_same_stage_job_needs, processable.project, default_enabled: :yaml) - (stage_dependent_jobs(processable) | needs_dependent_jobs(processable)) - .each do |processable| - process(processable) - end - else - skipped_jobs(processable).after_stage(processable.stage_idx) - .find_each do |job| - process(job) - end + (stage_dependent_jobs(processable) | needs_dependent_jobs(processable)) + .each do |processable| + process(processable) end end |