summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request_tabs.js.es6
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-01-13 16:54:16 -0500
committerBryce Johnson <bryce@gitlab.com>2017-02-02 14:03:12 -0500
commitfbd09871ca7003242053fbca10d9c0e96e7a799d (patch)
tree0703d65519dbc98fa57796ee08fd8086e9863c32 /app/assets/javascripts/merge_request_tabs.js.es6
parente3a5f1df29ca09797217d90af4ce0086a66fcd8d (diff)
downloadgitlab-ce-fbd09871ca7003242053fbca10d9c0e96e7a799d.tar.gz
Remove turbolinks.
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js.es6')
-rw-r--r--app/assets/javascripts/merge_request_tabs.js.es63
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.es6 b/app/assets/javascripts/merge_request_tabs.js.es6
index 4c8c28af755..33463b46008 100644
--- a/app/assets/javascripts/merge_request_tabs.js.es6
+++ b/app/assets/javascripts/merge_request_tabs.js.es6
@@ -184,12 +184,13 @@
// Ensure parameters and hash come along for the ride
newState += location.search + location.hash;
+ // TODO: Consider refactoring in light of turbolinks removal.
+
// Replace the current history state with the new one without breaking
// Turbolinks' history.
//
// See https://github.com/rails/turbolinks/issues/363
window.history.replaceState({
- turbolinks: true,
url: newState,
}, document.title, newState);