diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-07 06:18:03 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-07 06:18:03 +0000 |
| commit | 6ea35f98241b351747dd445738be58e3d65cafa2 (patch) | |
| tree | e275f29504ad77578b637cf0b9524feb4b094cac | |
| parent | 30c8849962f04a69f01a10849105ae549c4e4d26 (diff) | |
| parent | d0821ae66785b18ba7af017b9498e53d3002e835 (diff) | |
| download | gitlab-ce-6ea35f98241b351747dd445738be58e3d65cafa2.tar.gz | |
Merge branch 'mr-new-page-changing-url' into 'master'
Stop new merge request page tabs updating the URL
Closes #30419
See merge request !10471
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/mr-new-page-changing-url.yml | 4 |
2 files changed, 6 insertions, 1 deletions
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: |