summaryrefslogtreecommitdiff
path: root/app/models/ci/build_metadata.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 14:16:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 14:16:34 +0000
commit4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (patch)
tree2b256ff8dfe63dafe7f42b0d995f9e74fd1dc48b /app/models/ci/build_metadata.rb
parentbd860c22f6a4b9473cbddd34a53eead8235a7ea1 (diff)
downloadgitlab-ce-4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci/build_metadata.rb')
-rw-r--r--app/models/ci/build_metadata.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb
index 89cdd8c64f8..3097e40dd3b 100644
--- a/app/models/ci/build_metadata.rb
+++ b/app/models/ci/build_metadata.rb
@@ -25,6 +25,9 @@ module Ci
chronic_duration_attr_reader :timeout_human_readable, :timeout
+ scope :scoped_build, -> { where('ci_builds_metadata.build_id = ci_builds.id') }
+ scope :with_interruptible, -> { where(interruptible: true) }
+
enum timeout_source: {
unknown_timeout_source: 1,
project_timeout_source: 2,