summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2017-09-04 15:58:01 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2017-09-04 15:58:01 +0200
commit63e308f6a5db8f1f437667e08413599c77b0262d (patch)
tree582239229a6b882def2dbbfeffc8f3e2b5483a4f /app/models/project.rb
parentd8e40c2aa60ccb8dcc9bf0f8d0ba22e7408607e6 (diff)
downloadgitlab-ce-63e308f6a5db8f1f437667e08413599c77b0262d.tar.gz
Fix boolean logic with nil value
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 798f3dfe853..085ab6e467a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -469,7 +469,7 @@ class Project < ActiveRecord::Base
end
def auto_devops_enabled?
- if auto_devops
+ if auto_devops && !auto_devops.enabled.nil?
auto_devops.enabled?
else
current_application_settings.auto_devops_enabled?