From afda6fa98100b078f546a7cdd8404ade8e86bcc3 Mon Sep 17 00:00:00 2001 From: Dylan Griffith Date: Fri, 10 Aug 2018 13:40:50 +0100 Subject: Minor refactoring simplification of Project#auto_devops_enabled? --- app/models/project.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 36089995ed3..4f28e9d6a06 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -500,11 +500,8 @@ class Project < ActiveRecord::Base end def auto_devops_enabled? - if auto_devops&.enabled.nil? - Gitlab::CurrentSettings.auto_devops_enabled? - else - auto_devops.enabled? - end + auto_devops&.enabled? || + has_auto_devops_implicitly_enabled? end def has_auto_devops_implicitly_enabled? -- cgit v1.2.1