Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 8 deletions

diff --git a/app/assets/javascripts/ide/lib/gitlab_web_ide/get_base_config.js b/app/assets/javascripts/ide/lib/gitlab_web_ide/get_base_config.js
index dbb68b7facd..e131fb669ea 100644
--- a/app/assets/javascripts/ide/lib/gitlab_web_ide/get_base_config.js
+++ b/app/assets/javascripts/ide/lib/gitlab_web_ide/get_base_config.js
@@ -1,17 +1,15 @@
 import { cleanEndingSeparator, joinPaths } from '~/lib/utils/url_utility';
 
-const getBaseUrl = () => {
-  const path = joinPaths(
-    '/',
-    window.gon.relative_url_root || '',
-    process.env.GITLAB_WEB_IDE_PUBLIC_PATH,
-  );
+const getGitLabUrl = (gitlabPath = '') => {
+  const path = joinPaths('/', window.gon.relative_url_root || '', gitlabPath);
   const baseUrlObj = new URL(path, window.location.origin);
 
   return cleanEndingSeparator(baseUrlObj.href);
 };
 
 export const getBaseConfig = () => ({
-  baseUrl: getBaseUrl(),
-  gitlabUrl: window.gon.gitlab_url,
+  // baseUrl - The URL which hosts the Web IDE static web assets
+  baseUrl: getGitLabUrl(process.env.GITLAB_WEB_IDE_PUBLIC_PATH),
+  // baseUrl - The URL for the GitLab instance
+  gitlabUrl: getGitLabUrl(''),
 });