diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-18 18:22:17 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-19 09:14:30 +0300 |
| commit | c471217feb5ec6fd777dd4cc9767bf79e7638e3e (patch) | |
| tree | 3e8189dce9c3ce470ea11d41822e2f1aed41ca4d | |
| parent | 1d9957d10a853a5b47019190dffc45cb13e694b7 (diff) | |
Merge branch 'merge-request-new-page-double-pipelines-table' into 'master'
Disable initialization table pipeline for new merge request form
Closes #31052
See merge request !10765
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_pipelines.html.haml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index 03069804c86..da79ca2ee75 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: url_for(params.merge(format: :json)) + = render 'projects/merge_requests/show/pipelines', endpoint: url_for(params.merge(format: :json)), disable_initialization: true .mr-loading-status = spinner diff --git a/app/views/projects/merge_requests/show/_pipelines.html.haml b/app/views/projects/merge_requests/show/_pipelines.html.haml index de4aa255bbd..2f1dbe87619 100644 --- a/app/views/projects/merge_requests/show/_pipelines.html.haml +++ b/app/views/projects/merge_requests/show/_pipelines.html.haml @@ -1,3 +1,4 @@ - endpoint_path = local_assigns[:endpoint] || pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, format: :json) +- disable_initialization = local_assigns.fetch(:disable_initialization, false) -= render 'projects/commit/pipelines_list', endpoint: endpoint_path += render 'projects/commit/pipelines_list', endpoint: endpoint_path, disable_initialization: disable_initialization |