diff --git a/ee/app/assets/javascripts/admin/subscriptions/show/constants.js b/ee/app/assets/javascripts/admin/subscriptions/show/constants.js index ebf73b1d60ea66d7da866b6673dbd311ffebcb1c..f230cba027f1ea1eb7a6d9de5eb0689a4d12910d 100644 --- a/ee/app/assets/javascripts/admin/subscriptions/show/constants.js +++ b/ee/app/assets/javascripts/admin/subscriptions/show/constants.js @@ -88,7 +88,7 @@ export const subscriptionSyncStatus = { }; export const subscriptionTypes = { CLOUD: 'cloud', - LICENSE_FILE: 'legacy', + LICENSE_FILE: 'license_file', }; export const subscriptionQueries = { diff --git a/ee/app/models/license.rb b/ee/app/models/license.rb index 53d6ea15550dde79cf5ecda25a40b34ec271ecb0..23f4699504f06c9043738ba8c614fe597cdf50ac 100644 --- a/ee/app/models/license.rb +++ b/ee/app/models/license.rb @@ -8,7 +8,7 @@ class License < ApplicationRecord PREMIUM_PLAN = 'premium' ULTIMATE_PLAN = 'ultimate' CLOUD_LICENSE_TYPE = 'cloud' - LEGACY_LICENSE_TYPE = 'legacy' + LICENSE_FILE_TYPE = 'license_file' ALLOWED_PERCENTAGE_OF_USERS_OVERAGE = (10 / 100.0) EE_ALL_PLANS = [STARTER_PLAN, PREMIUM_PLAN, ULTIMATE_PLAN].freeze @@ -561,7 +561,7 @@ class License < ApplicationRecord end def license_type - cloud_license? ? CLOUD_LICENSE_TYPE : LEGACY_LICENSE_TYPE + cloud_license? ? CLOUD_LICENSE_TYPE : LICENSE_FILE_TYPE end def auto_renew diff --git a/ee/spec/models/license_spec.rb b/ee/spec/models/license_spec.rb index 2d45170606859df60366fce041a79dd4b1d1cacb..f1384cefd79490087f8a4e0a0d2811010b618a3b 100644 --- a/ee/spec/models/license_spec.rb +++ b/ee/spec/models/license_spec.rb @@ -1459,7 +1459,7 @@ RSpec.describe License do subject { license.license_type } context 'when the license is not a cloud license' do - it { is_expected.to eq(described_class::LEGACY_LICENSE_TYPE) } + it { is_expected.to eq(described_class::LICENSE_FILE_TYPE) } end context 'when the license is a cloud license' do diff --git a/ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/activate_spec.rb b/ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/activate_spec.rb index 755cc5de54ec4a914cb4d668af05ea065e97164d..97c4742e154a8f1b7c70ccb51872474f0129bbb0 100644 --- a/ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/activate_spec.rb +++ b/ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/activate_spec.rb @@ -53,7 +53,7 @@ RSpec.describe 'Activate a subscription' do expect(mutation_response['license']).to eq( { 'id' => "gid://gitlab/License/#{created_license.id}", - 'type' => License::LEGACY_LICENSE_TYPE, + 'type' => License::LICENSE_FILE_TYPE, 'plan' => created_license.plan, 'name' => created_license.licensee_name, 'email' => created_license.licensee_email,