Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 4 insertions, 0 deletions

diff --git a/app/assets/javascripts/ide/stores/mutations.js b/app/assets/javascripts/ide/stores/mutations.js
index 48648796e66..d11fc388d5e 100644
--- a/app/assets/javascripts/ide/stores/mutations.js
+++ b/app/assets/javascripts/ide/stores/mutations.js
@@ -110,6 +110,7 @@ export default {
       committedStateSvgPath,
       pipelinesEmptyStateSvgPath,
       promotionSvgPath,
+      switchEditorSvgPath,
     },
   ) {
     Object.assign(state, {
@@ -118,6 +119,7 @@ export default {
       committedStateSvgPath,
       pipelinesEmptyStateSvgPath,
       promotionSvgPath,
+      switchEditorSvgPath,
     });
   },
   [types.TOGGLE_FILE_FINDER](state, fileFindVisible) {
diff --git a/app/assets/javascripts/ide/stores/state.js b/app/assets/javascripts/ide/stores/state.js
index 526987c750a..70efda970bf 100644
--- a/app/assets/javascripts/ide/stores/state.js
+++ b/app/assets/javascripts/ide/stores/state.js
@@ -33,4 +33,6 @@ export default () => ({
   environmentsGuidanceAlertDismissed: false,
   environmentsGuidanceAlertDetected: false,
   previewMarkdownPath: '',
+  userPreferencesPath: '',
+  canUseNewWebIde: false,
 });