From 63e308f6a5db8f1f437667e08413599c77b0262d Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Mon, 4 Sep 2017 15:58:01 +0200
Subject: [PATCH] Fix boolean logic with nil value

---
 app/models/project.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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?