diff options
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 3 | ||||
| -rw-r--r-- | app/models/ci/stage.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index dce9168a9a4..1f7f5f6babe 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -93,8 +93,7 @@ module Ci validates :ref, presence: true scope :not_interruptible, -> do - joins(:metadata).where('ci_builds_metadata.id NOT IN (?)', - Ci::BuildMetadata.scoped_build.with_interruptible.select(:id)) + joins(:metadata).where.not('ci_builds_metadata.id' => Ci::BuildMetadata.scoped_build.with_interruptible.select(:id)) end scope :unstarted, -> { where(runner_id: nil) } diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb index fe6889a6808..9dd75150ac7 100644 --- a/app/models/ci/stage.rb +++ b/app/models/ci/stage.rb @@ -44,7 +44,7 @@ module Ci next if position.present? self.position = statuses.select(:stage_idx) - .where('stage_idx IS NOT NULL') + .where.not(stage_idx: nil) .group(:stage_idx) .order('COUNT(*) DESC') .first&.stage_idx.to_i |