From bf6a0e47ffaaa80d8cefd3f6b41101dcf5b663bf Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Tue, 7 Feb 2017 19:02:58 +0000 Subject: Remove changelog entry; Changes after review --- app/views/projects/merge_requests/_new_submit.html.haml | 2 +- changelogs/unreleased/fix-gb-invalid-new-merge-request-api.yml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 changelogs/unreleased/fix-gb-invalid-new-merge-request-api.yml diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index ef387866cbe..bd72310c16b 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: request.fullpath + = render 'projects/merge_requests/show/pipelines', endpoint: url_for(params.merge(format: :json)) .mr-loading-status = spinner diff --git a/changelogs/unreleased/fix-gb-invalid-new-merge-request-api.yml b/changelogs/unreleased/fix-gb-invalid-new-merge-request-api.yml deleted file mode 100644 index 312056b23bf..00000000000 --- a/changelogs/unreleased/fix-gb-invalid-new-merge-request-api.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fix rendering new merge request pipelines -merge_request: 9032 -author: -- cgit v1.2.1