Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fd5788e2
Commit
fd5788e2
authored
Jun 14, 2021
by
Rubén Dávila
Committed by
Matthias Käppler
Jun 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename License::LEGACY_LICENSE_TYPE to License::LICENSE_FILE_TYPE
Also changed the value from `legacy` to `license_file`
parent
3d0122af
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/assets/javascripts/admin/subscriptions/show/constants.js
.../assets/javascripts/admin/subscriptions/show/constants.js
+1
-1
ee/app/models/license.rb
ee/app/models/license.rb
+2
-2
ee/spec/models/license_spec.rb
ee/spec/models/license_spec.rb
+1
-1
ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/activate_spec.rb
...i/graphql/mutations/gitlab_subscriptions/activate_spec.rb
+1
-1
No files found.
ee/app/assets/javascripts/admin/subscriptions/show/constants.js
View file @
fd5788e2
...
...
@@ -88,7 +88,7 @@ export const subscriptionSyncStatus = {
};
export
const
subscriptionTypes
=
{
CLOUD
:
'
cloud
'
,
LICENSE_FILE
:
'
l
egacy
'
,
LICENSE_FILE
:
'
l
icense_file
'
,
};
export
const
subscriptionQueries
=
{
...
...
ee/app/models/license.rb
View file @
fd5788e2
...
...
@@ -8,7 +8,7 @@ class License < ApplicationRecord
PREMIUM_PLAN
=
'premium'
ULTIMATE_PLAN
=
'ultimate'
CLOUD_LICENSE_TYPE
=
'cloud'
L
EGACY_LICENSE_TYPE
=
'legacy
'
L
ICENSE_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
:
L
EGACY_LICENS
E_TYPE
cloud_license?
?
CLOUD_LICENSE_TYPE
:
L
ICENSE_FIL
E_TYPE
end
def
auto_renew
...
...
ee/spec/models/license_spec.rb
View file @
fd5788e2
...
...
@@ -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
::
L
EGACY_LICENS
E_TYPE
)
}
it
{
is_expected
.
to
eq
(
described_class
::
L
ICENSE_FIL
E_TYPE
)
}
end
context
'when the license is a cloud license'
do
...
...
ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/activate_spec.rb
View file @
fd5788e2
...
...
@@ -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
::
L
EGACY_LICENS
E_TYPE
,
'type'
=>
License
::
L
ICENSE_FIL
E_TYPE
,
'plan'
=>
created_license
.
plan
,
'name'
=>
created_license
.
licensee_name
,
'email'
=>
created_license
.
licensee_email
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment