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

Prefer to use overrides on PipelinesController

See merge request gitlab-org/gitlab-ce!24793

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