diff options
author | Sean McGivern <sean@gitlab.com> | 2019-01-30 14:03:02 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-01-30 14:03:02 +0000 |
commit | 4d8e27df41c9ae17ac8b3200fa889b1cbc0c3d4b (patch) | |
tree | da84bc09c7da556d8837a83f0b2c192387102ae7 | |
parent | 143975841cc47ce775e6b0d8c58517953cfc92fa (diff) | |
parent | c651191d143b71a163d2a27bcf6038404212c437 (diff) | |
download | gitlab-ce-4d8e27df41c9ae17ac8b3200fa889b1cbc0c3d4b.tar.gz |
Merge branch '8688-recursive-pipelines' into 'master'
Prefer to use overrides on PipelinesController
See merge request gitlab-org/gitlab-ce!24793
-rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 67827b1d3bb..e6d029c356b 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -69,7 +69,7 @@ class Projects::PipelinesController < Projects::ApplicationController render json: PipelineSerializer .new(project: @project, current_user: @current_user) - .represent(@pipeline, grouped: true) + .represent(@pipeline, show_represent_params) end end end @@ -157,6 +157,10 @@ class Projects::PipelinesController < Projects::ApplicationController end end + def show_represent_params + { grouped: true } + end + def create_params params.require(:pipeline).permit(:ref, variables_attributes: %i[key secret_value]) end |