Commit 25c1f051 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Fix rendering pipelines for a new merge request

parent 9c916bf5
...@@ -227,9 +227,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -227,9 +227,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html { define_new_vars } format.html { define_new_vars }
format.json do format.json do
render json: { pipelines: PipelineSerializer define_pipelines_vars
render json: PipelineSerializer
.new(project: @project, user: @current_user) .new(project: @project, user: @current_user)
.represent(@pipelines) } .represent(@pipelines)
end end
end end
end end
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
-# This tab is always loaded via AJAX -# This tab is always loaded via AJAX
- if @pipelines.any? - if @pipelines.any?
#pipelines.pipelines.tab-pane #pipelines.pipelines.tab-pane
= render "projects/merge_requests/show/pipelines", endpoint: link_to(url_for(params)) = render 'projects/merge_requests/show/pipelines', endpoint: request.fullpath
.mr-loading-status .mr-loading-status
= spinner = spinner
......
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