diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-06 07:20:36 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-06 07:20:36 +0000 |
| commit | 6afe25ef336aca40b87cede499f8b8f5928129f6 (patch) | |
| tree | 493201a50520e6b9c1f6f861aaeb8859a4b6f19f /app/controllers/projects | |
| parent | 6c15905c3bd11209858eac8870ffa9211f08f157 (diff) | |
| parent | cca9242085d73dff66a946af8a740a4f7419f84c (diff) | |
| download | gitlab-ce-6afe25ef336aca40b87cede499f8b8f5928129f6.tar.gz | |
Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'
Resolve "Project option to allow customizing CI/CD config path"
Closes #32815 and #33130
See merge request !12509
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/pipelines_settings_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb index f13884307b6..9d24ebe2138 100644 --- a/app/controllers/projects/pipelines_settings_controller.rb +++ b/app/controllers/projects/pipelines_settings_controller.rb @@ -23,7 +23,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController def update_params params.require(:project).permit( :runners_token, :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex, - :public_builds, :auto_cancel_pending_pipelines + :public_builds, :auto_cancel_pending_pipelines, :ci_config_path ) end end |