diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-02-07 21:21:30 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-02-07 21:21:30 +0000 |
| commit | 71c80375474e0bda201de07870587b0bb8553069 (patch) | |
| tree | 1b4aa9316ba709a534f06522d8224d78fd38ccf0 /app/controllers | |
| parent | 9aafb2a6d3c1b2588ef0689d6919014150123e64 (diff) | |
| parent | d410c937a509c46cd1de807937b8d74bf383070c (diff) | |
| download | gitlab-ce-71c80375474e0bda201de07870587b0bb8553069.tar.gz | |
Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master'
Fix rendering pipelines for a new merge request
See merge request !9032
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 3be6e8e1772..fbad66c5c40 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -229,9 +229,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController respond_to do |format| format.html { define_new_vars } format.json do - render json: { pipelines: PipelineSerializer + define_pipelines_vars + + render json: PipelineSerializer .new(project: @project, user: @current_user) - .represent(@pipelines) } + .represent(@pipelines) end end end |