Merge branch 'mr-new-page-changing-url' into 'master'

Stop new merge request page tabs updating the URL Closes #30419 See merge request !10471

Merge branch 'mr-new-page-changing-url' into 'master'
6ea35f98 · Alfredo Sumaran · 30c88499 · d0821ae6 · 6ea35f98 · 6ea35f98
Commit 6ea35f98 authored Apr 07, 2017 by Alfredo Sumaran
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

_new_submit.html.haml app/views/projects/merge_requests/_new_submit.html.haml +2 -1

mr-new-page-changing-url.yml changelogs/unreleased/mr-new-page-changing-url.yml +4 -0

No files found.
--- 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,
  });
--- a/changelogs/unreleased/mr-new-page-changing-url.yml
+++ b/changelogs/unreleased/mr-new-page-changing-url.yml
+---
+title: Fixed tabs on new merge request page causing incorrect URLs
+merge_request:
+author: