Fix create_next_builds method

1 files changed, 3 insertions, 3 deletions

diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 2ab1fefe8e1..94951ced1fd 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -116,12 +116,12 @@ module Ci
       next_stages.delete(build.stage)
 
       # get status for all prior builds
-      prior_builds = latest_builds.reject { |other_build| next_stages.include?(other_build.stage) }
-      status = prior_builds.status
+      prior_builds = latest_builds.where.not(stage: next_stages)
+      prior_status = prior_builds.status
 
       # create builds for next stages based
       next_stages.any? do |stage|
-        CreateBuildsService.new(self).execute(stage, build.user, status, build.trigger_request).present?
+        CreateBuildsService.new(self).execute(stage, build.user, prior_status, build.trigger_request).present?
       end
     end