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

Fix auto_cancel_pending_pipelines check

Closes #47834

See merge request gitlab-org/gitlab-ce!19820
This commit is contained in:
Sean McGivern 2018-06-25 08:22:42 +00:00
commit d07e16faa7

View file

@ -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