summaryrefslogtreecommitdiff
path: root/app/services/projects/update_service.rb
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-05-28 21:10:51 +0200
committerMatija Čupić <matteeyah@gmail.com>2018-05-28 21:10:51 +0200
commitaac8d1f3363a87f0bcd31009aad41d577f0a3f67 (patch)
tree3f816f79b7a1ad2d18e1489cf90771fb965418cc /app/services/projects/update_service.rb
parent6e354cb642f911dc71be3d5368f066900fc25970 (diff)
downloadgitlab-ce-aac8d1f3363a87f0bcd31009aad41d577f0a3f67.tar.gz
Add check for nil auto_devops in Projects::UpdateService
Diffstat (limited to 'app/services/projects/update_service.rb')
-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 679f4a9cb62..1cea110d555 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -36,7 +36,7 @@ module Projects
end
def run_auto_devops_pipeline?
- return false if project.repository.gitlab_ci_yml || !project.auto_devops.previous_changes.include?('enabled')
+ return false if project.repository.gitlab_ci_yml || project.auto_devops.nil? || !project.auto_devops.previous_changes.include?('enabled')
project.auto_devops.enabled? || (project.auto_devops.enabled.nil? && Gitlab::CurrentSettings.auto_devops_enabled?)
end