diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-07 17:11:07 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-07 17:11:07 +0000 |
| commit | 245fad4d8854e74b6f39c763c2f8d047eeb5f4eb (patch) | |
| tree | ebcea65553d80abc995ce753a8bcb185ed5a6875 /app/controllers | |
| parent | 9dffd0ab6b2e9f5b0db55230d8991f50a01f7669 (diff) | |
| parent | 5a2a0b284cf721e6cba63fc69fb7550f5039da8a (diff) | |
| download | gitlab-ce-245fad4d8854e74b6f39c763c2f8d047eeb5f4eb.tar.gz | |
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/controllers')
| -rw-r--r-- | app/controllers/projects/pipelines_settings_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb index b890818c475..06ce7328fb5 100644 --- a/app/controllers/projects/pipelines_settings_controller.rb +++ b/app/controllers/projects/pipelines_settings_controller.rb @@ -29,7 +29,6 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController :runners_token, :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex, :public_builds, :auto_cancel_pending_pipelines, :ci_config_path, - :run_auto_devops_pipeline_implicit, :run_auto_devops_pipeline_explicit, auto_devops_attributes: [:id, :domain, :enabled] ) end |