Skip to content

Commit 3d17881

Browse files
mustard-mhroboquat
authored andcommitted
Compatible with ide-config
1 parent 47af622 commit 3d17881

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

components/dashboard/src/settings/Preferences.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ export default function Preferences() {
9090
useEffect(() => {
9191
(async () => {
9292
const ideopts = await getGitpodService().server.getIDEOptions();
93+
// TODO: Compatible with ide-config not deployed, need revert after ide-config deployed
94+
delete ideopts.options["code-latest"];
95+
delete ideopts.options["code-desktop-insiders"];
9396

9497
setIdeOptions(ideopts);
9598
if (!defaultIde || ideopts.options[defaultIde] == null) {

components/server/src/workspace/workspace-starter.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,10 @@ export class WorkspaceStarter {
591591
excludeFeatureFlags: NamedWorkspaceFeatureFlag[],
592592
ideConfig: IDEConfig,
593593
): Promise<WorkspaceInstance> {
594+
// TODO: Compatible with ide-config not deployed, need revert after ide-config deployed
595+
delete ideConfig.ideOptions.options["code-latest"];
596+
delete ideConfig.ideOptions.options["code-desktop-insiders"];
597+
594598
const migratted = migrationIDESettings(user);
595599
if (user.additionalData?.ideSettings && migratted) {
596600
user.additionalData.ideSettings = migratted;

0 commit comments

Comments
 (0)