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
63ed6908
Commit
63ed6908
authored
Jul 09, 2021
by
Siddharth Asthana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename License.usage_ping to License.customer_service_enabled
Changelog: other EE: true
parent
d33dde1f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/models/license.rb
ee/app/models/license.rb
+1
-1
ee/app/services/ee/service_ping/build_payload_service.rb
ee/app/services/ee/service_ping/build_payload_service.rb
+1
-1
ee/app/services/ee/service_ping/permit_data_categories_service.rb
...ervices/ee/service_ping/permit_data_categories_service.rb
+2
-2
ee/spec/models/license_spec.rb
ee/spec/models/license_spec.rb
+2
-2
No files found.
ee/app/models/license.rb
View file @
63ed6908
...
...
@@ -576,7 +576,7 @@ class License < ApplicationRecord
!!
license
&
.
cloud_licensing?
end
def
usage_ping
?
def
customer_service_enabled
?
!!
license
&
.
usage_ping_required_metrics?
end
...
...
ee/app/services/ee/service_ping/build_payload_service.rb
View file @
63ed6908
...
...
@@ -16,7 +16,7 @@ module EE
override
:product_intelligence_enabled?
def
product_intelligence_enabled?
::
License
.
current
&
.
usage_ping
?
||
super
::
License
.
current
&
.
customer_service_enabled
?
||
super
end
def
filtered_usage_data
(
payload
=
raw_payload
,
parents
=
[])
...
...
ee/app/services/ee/service_ping/permit_data_categories_service.rb
View file @
63ed6908
...
...
@@ -16,7 +16,7 @@ module EE
return
[]
unless
product_intelligence_enabled?
optional_enabled
=
::
Gitlab
::
CurrentSettings
.
usage_ping_enabled?
customer_service_enabled
=
::
License
.
current
.
usage_ping
?
customer_service_enabled
=
::
License
.
current
.
customer_service_enabled
?
[
STANDARD_CATEGORY
,
SUBSCRIPTION_CATEGORY
].
tap
do
|
categories
|
categories
<<
OPERATIONAL_CATEGORY
<<
OPTIONAL_CATEGORY
if
optional_enabled
...
...
@@ -28,7 +28,7 @@ module EE
override
:pings_enabled?
def
pings_enabled?
::
License
.
current
&
.
usage_ping
?
||
super
::
License
.
current
&
.
customer_service_enabled
?
||
super
end
end
end
...
...
ee/spec/models/license_spec.rb
View file @
63ed6908
...
...
@@ -1520,8 +1520,8 @@ RSpec.describe License do
end
end
describe
'#
usage_ping
?'
do
subject
{
license
.
usage_ping
?
}
describe
'#
customer_service_enabled
?'
do
subject
{
license
.
customer_service_enabled
?
}
context
'when no license provided'
do
before
do
...
...
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