Fix rendering pipelines for a new merge request
This commit is contained in:
parent
9c916bf528
commit
25c1f05103
2 changed files with 5 additions and 3 deletions
|
@ -227,9 +227,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
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
-# This tab is always loaded via AJAX
|
||||
- if @pipelines.any?
|
||||
#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
|
||||
= spinner
|
||||
|
|
Loading…
Reference in a new issue