summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/lib/utils/url_utility.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-06-07 14:47:09 +0100
committerPhil Hughes <me@iamphill.com>2018-06-07 14:47:09 +0100
commit02a2ca6ae4ab6f2b64ff00f5750a68e9371a4fb7 (patch)
tree04dd78c71a406dcf667d14c074ccaf8a966edef4 /app/assets/javascripts/lib/utils/url_utility.js
parent3094f1c1f2986d82994f3da988c3ae3eb5780c14 (diff)
downloadgitlab-ce-02a2ca6ae4ab6f2b64ff00f5750a68e9371a4fb7.tar.gz
Fixes IDE button on merge requests not working with relative URL config
Closes #46438
Diffstat (limited to 'app/assets/javascripts/lib/utils/url_utility.js')
-rw-r--r--app/assets/javascripts/lib/utils/url_utility.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js
index dd17544b656..061fb72ffef 100644
--- a/app/assets/javascripts/lib/utils/url_utility.js
+++ b/app/assets/javascripts/lib/utils/url_utility.js
@@ -87,7 +87,7 @@ export function redirectTo(url) {
export function webIDEUrl(route = undefined) {
let returnUrl = `${gon.relative_url_root}/-/ide/`;
if (route) {
- returnUrl += `project${route}`;
+ returnUrl += `project${route.replace(new RegExp(`^${gon.relative_url_root}`), '')}`;
}
return returnUrl;
}