diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-27 13:44:05 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-27 13:44:48 +0100 |
| commit | 3cb37c0349d4601c2f3189f9422eca557fff8687 (patch) | |
| tree | 456c867d1d9f930e0983d3f729cb4a7a9bb3a99b | |
| parent | 1ad6b3696bdeedcc27af4db4f592b39942e19f7d (diff) | |
| download | gitlab-ce-3cb37c0349d4601c2f3189f9422eca557fff8687.tar.gz | |
Expose serialized pipelines API for merge requests
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 9ac5bf4b9f8..3492502e296 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -214,7 +214,16 @@ class Projects::MergeRequestsController < Projects::ApplicationController render 'show' end - format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_pipelines') } } + + format.json do + render json: { + html: view_to_html_string('projects/merge_requests/show/_pipelines'), + pipelines: PipelineSerializer + .new(project: @project, user: @current_user) + .with_pagination(request, response) + .represent(@pipelines) + } + end end end |