Add has_auto_devops_implicitly_disabled

2 files changed, 5 insertions, 2 deletions

diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb
index e4907f631ef..4ff38f86b5f 100644
--- a/app/helpers/auto_devops_helper.rb
+++ b/app/helpers/auto_devops_helper.rb
@@ -2,7 +2,6 @@ module AutoDevopsHelper
   def show_auto_devops_callout?(project)
     show_callout?('auto_devops_settings_dismissed') &&
       can?(current_user, :admin_pipeline, project) &&
-      !current_application_settings.auto_devops_enabled? &&
-      project.auto_devops&.enabled.nil?
+      project.has_auto_devops_implicitly_disabled?
   end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index b52b1e9049b..ca64fb173fb 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -477,6 +477,10 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def has_auto_devops_implicitly_disabled?
+    auto_devops&.enabled.nil? && !current_application_settings.auto_devops_enabled?
+  end
+
   def repository_storage_path
     Gitlab.config.repositories.storages[repository_storage].try(:[], 'path')
   end