diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-18 14:06:27 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-18 14:06:27 +0100 |
| commit | 1194d904dd6f92230e178c2252fbe44c8d8b0832 (patch) | |
| tree | 2ee8e120b0703e87e44e93960f38de54170eec30 /app | |
| parent | 00c1e31c1c3a5631b85a0f2be1389d0c87be376c (diff) | |
| download | gitlab-ce-1194d904dd6f92230e178c2252fbe44c8d8b0832.tar.gz | |
Disable initialization table pipeline for new merge request form
Closes #31052
Diffstat (limited to 'app')
| -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 |