From d0821ae66785b18ba7af017b9498e53d3002e835 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 5 Apr 2017 10:42:31 +0100 Subject: Stop new merge request page tabs updating the URL The tabs on the merge_requests#new where changing the URL to URLs meant for merge_requests#show. The URL don't actually exist on the new page, so the simplest solution is to not update the URL for this page. Closes #30419 --- app/views/projects/merge_requests/_new_submit.html.haml | 3 ++- changelogs/unreleased/mr-new-page-changing-url.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/mr-new-page-changing-url.yml diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index e7fcac4c477..03069804c86 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -53,5 +53,6 @@ :javascript var merge_request = new MergeRequest({ - action: "#{(@show_changes_tab ? 'new/diffs' : 'new')}" + action: "#{(@show_changes_tab ? 'new/diffs' : 'new')}", + setUrl: false, }); diff --git a/changelogs/unreleased/mr-new-page-changing-url.yml b/changelogs/unreleased/mr-new-page-changing-url.yml new file mode 100644 index 00000000000..39de1eaa523 --- /dev/null +++ b/changelogs/unreleased/mr-new-page-changing-url.yml @@ -0,0 +1,4 @@ +--- +title: Fixed tabs on new merge request page causing incorrect URLs +merge_request: +author: -- cgit v1.2.1