Fix boolean logic with nil value

63e308f6 · Zeger-Jan van de Weg · d8e40c2a · 63e308f6
Commit 63e308f6 authored Sep 04, 2017 by Zeger-Jan van de Weg
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/models/project.rb app/models/project.rb +1 -1

No files found.
--- 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?