From 22d376f85948756b8e7ea68cc36e641639d84006 Mon Sep 17 00:00:00 2001 From: Cindy Halim Date: Wed, 26 Jun 2024 15:42:12 -0400 Subject: [PATCH 1/2] User preferences: ignore use_web_ide_extension_marketplace column --- app/models/user_preference.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 539c571a53ddd0..0bb53564596cd3 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -1,6 +1,10 @@ # frozen_string_literal: true class UserPreference < MainClusterwide::ApplicationRecord + include IgnorableColumns + + ignore_column :use_web_ide_extension_marketplace, remove_with: '17.4', remove_after: '2024-08-15' + # We could use enums, but Rails 4 doesn't support multiple # enum options with same name for multiple fields, also it creates # extra methods that aren't really needed here. -- GitLab From bd8c54ddbf00e8c11cfd0ccf320051409cd23c18 Mon Sep 17 00:00:00 2001 From: Cindy Halim Date: Fri, 5 Jul 2024 15:55:42 -0400 Subject: [PATCH 2/2] Update specs --- .../api/graphql/mutations/user_preferences/update_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/requests/api/graphql/mutations/user_preferences/update_spec.rb b/spec/requests/api/graphql/mutations/user_preferences/update_spec.rb index 4b70850f8d0bd0..b0c8fc7e2ba49e 100644 --- a/spec/requests/api/graphql/mutations/user_preferences/update_spec.rb +++ b/spec/requests/api/graphql/mutations/user_preferences/update_spec.rb @@ -39,7 +39,7 @@ expect(current_user.user_preference.extensions_marketplace_opt_in_status).to eq('enabled') expect(current_user.user_preference.issues_sort).to eq(Types::IssueSortEnum.values[sort_value].value.to_s) expect(current_user.user_preference.visibility_pipeline_id_type).to eq('iid') - expect(current_user.user_preference.use_web_ide_extension_marketplace).to eq(true) + expect(current_user.user_preference.use_web_ide_extension_marketplace).to eq(false) end end @@ -51,7 +51,7 @@ organization_groups_projects_display: Types::Organizations::GroupsProjectsDisplayEnum.values['GROUPS'].value, organization_groups_projects_sort: 'NAME_DESC', visibility_pipeline_id_type: 'id', - use_web_ide_extension_marketplace: true + use_web_ide_extension_marketplace: false } end -- GitLab