Commit d07e16fa authored by Sean McGivern's avatar Sean McGivern

Merge branch 'rails5-enum-pipeline-check' into 'master'

Fix auto_cancel_pending_pipelines check

Closes #47834

See merge request gitlab-org/gitlab-ce!19820
parents ee62f1b3 face1999
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment