summaryrefslogtreecommitdiff
path: root/app/controllers/projects/pipelines_settings_controller.rb
diff options
context:
space:
mode:
authorKeith Pope <mute.pop3+gitlab@gmail.com>2016-08-05 10:29:09 +0100
committerKeith Pope <mute.pop3+gitlab@gmail.com>2016-10-08 12:30:47 +0100
commit07365e518330289149dd2135424c49fad19f401d (patch)
tree3a163231f4caa8f62c3fc5f4c0ca606c8ff92749 /app/controllers/projects/pipelines_settings_controller.rb
parent28ca8502c254d5c3edfb7ece36fc365e7a715df0 (diff)
downloadgitlab-ce-07365e518330289149dd2135424c49fad19f401d.tar.gz
Add config option to project to allow custom .gitlab-ci.yml location
Diffstat (limited to 'app/controllers/projects/pipelines_settings_controller.rb')
-rw-r--r--app/controllers/projects/pipelines_settings_controller.rb2
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 9136633b87a..d23418a9aa3 100644
--- a/app/controllers/projects/pipelines_settings_controller.rb
+++ b/app/controllers/projects/pipelines_settings_controller.rb
@@ -30,7 +30,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
+ :public_builds, :ci_config_file
)
end
end