diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-07 19:02:58 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-07 19:05:16 +0000 |
| commit | bf6a0e47ffaaa80d8cefd3f6b41101dcf5b663bf (patch) | |
| tree | 1fd031d5d6a59ea3a75c5d5882658b1544c79341 | |
| parent | b40f71479c536c64f0791e29c3aa7aff63e8c548 (diff) | |
| download | gitlab-ce-bf6a0e47ffaaa80d8cefd3f6b41101dcf5b663bf.tar.gz | |
Remove changelog entry; Changes after review
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-gb-invalid-new-merge-request-api.yml | 4 |
2 files changed, 1 insertions, 5 deletions
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: |