Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 3 deletions

diff --git a/app/assets/javascripts/ide/index.js b/app/assets/javascripts/ide/index.js
index 10e9f6a9488..1a191f6f76f 100644
--- a/app/assets/javascripts/ide/index.js
+++ b/app/assets/javascripts/ide/index.js
@@ -99,7 +99,9 @@ export function startIde(options) {
     return;
   }
 
-  if (gon.features?.vscodeWebIde) {
+  const useNewWebIde = parseBoolean(ideElement.dataset.useNewWebIde);
+
+  if (useNewWebIde) {
     initGitlabWebIDE(ideElement);
   } else {
     resetServiceWorkersPublicPath();
diff --git a/app/assets/javascripts/ide/init_gitlab_web_ide.js b/app/assets/javascripts/ide/init_gitlab_web_ide.js
index a061da38d4f..140f2895a29 100644
--- a/app/assets/javascripts/ide/init_gitlab_web_ide.js
+++ b/app/assets/javascripts/ide/init_gitlab_web_ide.js
@@ -7,8 +7,7 @@ export const initGitlabWebIDE = async (el) => {
   const baseUrl = new URL(process.env.GITLAB_WEB_IDE_PUBLIC_PATH, window.location.origin);
 
   // what: Pull what we need from the element. We will replace it soon.
-  const { path_with_namespace: projectPath } = JSON.parse(el.dataset.project);
-  const { cspNonce: nonce, branchName: ref } = el.dataset;
+  const { cspNonce: nonce, branchName: ref, projectPath } = el.dataset;
 
   // what: Clean up the element, but preserve id.
   // why:  This way we don't inherit any `ide-loading` side-effects. This