Commit 4d8e27df authored by Sean McGivern's avatar Sean McGivern

Merge branch '8688-recursive-pipelines' into 'master'

Prefer to use overrides on PipelinesController

See merge request gitlab-org/gitlab-ce!24793
parents 14397584 c651191d
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment