diff options
| -rw-r--r-- | app/models/project.rb | 7 |
1 files 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? |