diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-02-07 18:14:16 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-02-07 18:14:16 +0300 |
| commit | 25c1f0510347cc3891a9b1a2b113b2c51eacc2aa (patch) | |
| tree | 51a7909830abb7fa7a60bc99b42bcbd3d7728a3d /app | |
| parent | 9c916bf528a8076927df0ac18883513bd6ce415e (diff) | |
Fix rendering pipelines for a new merge request
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 38a1946a71e..af2e87f4865 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -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 diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index 38259faf62f..ef387866cbe 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -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 |