diff options
author | bikebilly <fabio@gitlab.com> | 2017-12-04 12:27:21 +0100 |
---|---|---|
committer | bikebilly <fabio@gitlab.com> | 2017-12-04 17:47:38 +0100 |
commit | 89d3fcd19346b9884140652a5ef13dd8744c3c43 (patch) | |
tree | f71169208133f3040657fd6dfba2b843afbf235b /app/services/projects | |
parent | 50eb125282ba83e71447161ee2add396fa5eef9b (diff) | |
download | gitlab-ce-89d3fcd19346b9884140652a5ef13dd8744c3c43.tar.gz |
Remove Auto DevOps checkboxes - backend
Diffstat (limited to 'app/services/projects')
-rw-r--r-- | app/services/projects/update_service.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb index 72eecc61c96..ff4c73c886e 100644 --- a/app/services/projects/update_service.rb +++ b/app/services/projects/update_service.rb @@ -15,7 +15,7 @@ module Projects return error("Could not set the default branch") unless project.change_head(params[:default_branch]) end - if project.update_attributes(update_params) + if project.update_attributes(params.except(:default_branch)) if project.previous_changes.include?('path') project.rename_repo else @@ -32,15 +32,13 @@ module Projects end def run_auto_devops_pipeline? - params.dig(:run_auto_devops_pipeline_explicit) == 'true' || params.dig(:run_auto_devops_pipeline_implicit) == 'true' + return false if project.repository.gitlab_ci_yml || !project.auto_devops.previous_changes.include?('enabled') + + project.auto_devops.enabled? || (project.auto_devops.enabled.nil? && current_application_settings.auto_devops_enabled?) end private - def update_params - params.except(:default_branch, :run_auto_devops_pipeline_explicit, :run_auto_devops_pipeline_implicit) - end - def renaming_project_with_container_registry_tags? new_path = params[:path] |