diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-01-13 16:54:16 -0500 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-01-30 15:38:28 -0500 |
| commit | 540da9b283a0884947915d761ddb731379ceaafb (patch) | |
| tree | f24e5a412ebfd3e8c222877f4044b63b446ce415 /app/assets/javascripts/lib | |
| parent | a0734363b1b2c5073f810f3b189670d4a8ecbc54 (diff) | |
| download | gitlab-ce-turbolinks-ee-compat.tar.gz | |
Port of 25624-anticipate-obstacles-to-removing-turbolinks to EE.turbolinks-ee-compat
Diffstat (limited to 'app/assets/javascripts/lib')
| -rw-r--r-- | app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6 | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/lib/utils/url_utility.js.es6 (renamed from app/assets/javascripts/lib/utils/url_utility.js) | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6 b/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6 index e810ee85bd3..2955bda1a36 100644 --- a/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6 +++ b/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6 @@ -95,7 +95,6 @@ const newState = `${copySource}${this.currentLocation.search}${this.currentLocation.hash}`; history.replaceState({ - turbolinks: true, url: newState, }, document.title, newState); return newState; diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js.es6 index 8e15bf0735c..a1558b371f0 100644 --- a/app/assets/javascripts/lib/utils/url_utility.js +++ b/app/assets/javascripts/lib/utils/url_utility.js.es6 @@ -76,5 +76,11 @@ hashIndex = url.indexOf('#'); return hashIndex === -1 ? null : url.substring(hashIndex + 1); }; + + w.gl.utils.refreshCurrentPage = () => gl.utils.visitUrl(document.location.href); + + w.gl.utils.visitUrl = (url) => { + document.location.href = url; + }; })(window); }).call(this); |