Fix API and IDE path with `/` relative_url_root

**Why?**
Previously we simply concatenated our paths, which led
to requesting `//api/v4/...` and obviously failed. The BE
supports a relative_url_root of `/`. It's a bug that the FE
does not.

3 files changed, 9 insertions, 10 deletions

diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
index 8754c253881..e583a8affd4 100644
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import _ from 'underscore';
 import axios from './lib/utils/axios_utils';
+import { joinPaths } from './lib/utils/url_utility';
 
 const Api = {
   groupsPath: '/api/:version/groups.json',
@@ -339,11 +340,7 @@ const Api = {
   },
 
   buildUrl(url) {
-    let urlRoot = '';
-    if (gon.relative_url_root != null) {
-      urlRoot = gon.relative_url_root;
-    }
-    return urlRoot + url.replace(':version', gon.api_version);
+    return joinPaths(gon.relative_url_root || '', url.replace(':version', gon.api_version));
   },
 };
 
diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js
index 229ef168926..518a9cf7a0f 100644
--- a/app/assets/javascripts/ide/ide_router.js
+++ b/app/assets/javascripts/ide/ide_router.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import { join as joinPath } from 'path';
+import { joinPaths } from '~/lib/utils/url_utility';
 import flash from '~/flash';
 import store from './stores';
 
@@ -34,7 +34,7 @@ const EmptyRouterComponent = {
 
 const router = new VueRouter({
   mode: 'history',
-  base: `${gon.relative_url_root}/-/ide/`,
+  base: joinPaths(gon.relative_url_root || '', '/-/ide/'),
   routes: [
     {
       path: '/project/:namespace+/:project',
@@ -46,11 +46,11 @@ const router = new VueRouter({
         },
         {
           path: ':targetmode(edit|tree|blob)/:branchid+/',
-          redirect: to => joinPath(to.path, '/-/'),
+          redirect: to => joinPaths(to.path, '/-/'),
         },
         {
           path: ':targetmode(edit|tree|blob)',
-          redirect: to => joinPath(to.path, '/master/-/'),
+          redirect: to => joinPaths(to.path, '/master/-/'),
         },
         {
           path: 'merge_requests/:mrid',
@@ -58,7 +58,7 @@ const router = new VueRouter({
         },
         {
           path: '',
-          redirect: to => joinPath(to.path, '/edit/master/-/'),
+          redirect: to => joinPaths(to.path, '/edit/master/-/'),
         },
       ],
     },
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js
index 4ba84589705..bdfd06fc250 100644
--- a/app/assets/javascripts/lib/utils/url_utility.js
+++ b/app/assets/javascripts/lib/utils/url_utility.js
@@ -120,3 +120,5 @@ export function webIDEUrl(route = undefined) {
   }
   return returnUrl;
 }
+
+export { join as joinPaths } from 'path';