diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-07 20:11:07 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-07 20:11:07 +0300 |
| commit | 245fad4d8854e74b6f39c763c2f8d047eeb5f4eb (patch) | |
| tree | ebcea65553d80abc995ce753a8bcb185ed5a6875 /app/helpers | |
| parent | 9dffd0ab6b2e9f5b0db55230d8991f50a01f7669 (diff) | |
| parent | 5a2a0b284cf721e6cba63fc69fb7550f5039da8a (diff) | |
Merge branch '40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settings' into 'master'
Resolve "Remove the checkbox for starting a new pipeline in Auto DevOps settings"
Closes #40761
See merge request gitlab-org/gitlab-ce!15714
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/auto_devops_helper.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb index ec6194d204f..f4310ca2f06 100644 --- a/app/helpers/auto_devops_helper.rb +++ b/app/helpers/auto_devops_helper.rb @@ -8,22 +8,6 @@ module AutoDevopsHelper !project.ci_service end - def show_run_auto_devops_pipeline_checkbox_for_instance_setting?(project) - return false if project.repository.gitlab_ci_yml - - if project&.auto_devops&.enabled.present? - !project.auto_devops.enabled && current_application_settings.auto_devops_enabled? - else - current_application_settings.auto_devops_enabled? - end - end - - def show_run_auto_devops_pipeline_checkbox_for_explicit_setting?(project) - return false if project.repository.gitlab_ci_yml - - !project.auto_devops_enabled? - end - def auto_devops_warning_message(project) missing_domain = !project.auto_devops&.has_domain? missing_service = !project.deployment_platform&.active? |