diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-18 15:22:17 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-18 15:22:17 +0000 |
| commit | 60f598996f831c26514991aaba83deefae61c283 (patch) | |
| tree | 7c54cf876d95e55bc9bd04ad6c34eae5d971ee51 | |
| parent | aecaaa67c3d84637e6c691ed07b44115330dddcb (diff) | |
| parent | 1194d904dd6f92230e178c2252fbe44c8d8b0832 (diff) | |
| download | gitlab-ce-60f598996f831c26514991aaba83deefae61c283.tar.gz | |
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 |