diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 10:23:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 10:23:33 +0000 |
| commit | aa97325deae515f45c047df3640d7b1f07247038 (patch) | |
| tree | 5f8290a85df328a9f2160f18d22f5b66bdc311b1 | |
| parent | 2f3a11fed3696f0f6a9490c0dd78c2004c83612b (diff) | |
| parent | 7f529ef0f7541c1063388f6fad337a0ad628cc99 (diff) | |
| download | gitlab-ce-aa97325deae515f45c047df3640d7b1f07247038.tar.gz | |
Merge branch 'rs-merge-request-tabs-the-third' into 'master'
Include location.search and location.hash in URL for replaceState
Forgot these :blush:
See merge request !740
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index 19967ebb2e5..b8f916b5223 100644 --- a/app/assets/javascripts/merge_request.js.coffee +++ b/app/assets/javascripts/merge_request.js.coffee @@ -148,6 +148,9 @@ class @MergeRequest unless action == 'notes' new_state += "/#{action}" + # Ensure parameters and hash come along for the ride + new_state += location.search + location.hash + # Replace the current history state with the new one without breaking # Turbolinks' history. # |