summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-06-25 08:22:42 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-06-25 08:22:42 +0000
commitface19997d2356b49a8a991d764415886a83c37a (patch)
treefa0e9b68f480ed695037c7ecf697c60f49a3a018 /app
parentee62f1b3b85a919b90208cdedc87a38997ea84eb (diff)
downloadgitlab-ce-face19997d2356b49a8a991d764415886a83c37a.tar.gz
Fix auto_cancel_pending_pipelines check
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 0d777515536..d91d7dcfe9a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2019,6 +2019,10 @@ class Project < ActiveRecord::Base
end
request_cache(:any_lfs_file_locks?) { self.id }
+ def auto_cancel_pending_pipelines?
+ auto_cancel_pending_pipelines == 'enabled'
+ end
+
private
def storage