summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-08-14 15:13:11 +0100
committerDylan Griffith <dyl.griffith@gmail.com>2018-08-14 15:13:11 +0100
commit538abe7b6316042004a4546b7928f7d6d9c5436a (patch)
tree0c2885a198bd3b739cf8ab1842b8bda7f62688a6
parentdc773777c449092269ea16d501474b23ae1d9a2f (diff)
downloadgitlab-ce-538abe7b6316042004a4546b7928f7d6d9c5436a.tar.gz
Fix UpdateService#run_auto_devops_pipeline? logic and reduce duplication
-rw-r--r--app/services/projects/update_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index 97f181ccea8..e390d7a04c3 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -30,7 +30,7 @@ module Projects
def run_auto_devops_pipeline?
return false if project.repository.gitlab_ci_yml || !project.auto_devops&.previous_changes&.include?('enabled')
- project.auto_devops.enabled? || (project.auto_devops.enabled.nil? && Gitlab::CurrentSettings.auto_devops_enabled?)
+ project.auto_devops_enabled?
end
private