Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-02 00:09:22 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-02 00:09:22 +0300
commit1e0d9b713469904253f2452d8d34922d316a766a (patch)
tree11f46c168733068698e025bf440fc37afecb4bfc /app/models/ci/build.rb
parent1769b59b9fd05325e3016b1a53a82ae6cf56adb5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci/build.rb')
-rw-r--r--app/models/ci/build.rb3
1 files changed, 1 insertions, 2 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) }