summaryrefslogtreecommitdiff
path: root/app/services/projects/update_service.rb
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-06-05 12:06:25 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-06-05 12:06:25 +0000
commit636d70381e3f5b2fe983127ece216e9bb6a07bb1 (patch)
treed3509ec87186f412a3490582241d6123384e3ec9 /app/services/projects/update_service.rb
parent9ca8d88b07406a51501999c1ea37dfdb0f697c06 (diff)
parent291dc5a21cbf171c14df230dcf056bee6d8bc6f8 (diff)
downloadgitlab-ce-636d70381e3f5b2fe983127ece216e9bb6a07bb1.tar.gz
Merge branch '46452-nomethoderror-undefined-method-previous_changes-for-nil-nilclass' into 'master'
Resolve "NoMethodError: undefined method `previous_changes' for nil:NilClass" Closes #46452 See merge request gitlab-org/gitlab-ce!19190
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 0e489ec5e86..0d1e2e758cd 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -38,7 +38,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&.previous_changes&.include?('enabled')
project.auto_devops.enabled? || (project.auto_devops.enabled.nil? && Gitlab::CurrentSettings.auto_devops_enabled?)
end