Commit 1f9b4333 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch '119082-add-trial-counters-to-usage-ping' into 'master'

Add trial counters to usage ping

See merge request gitlab-org/gitlab!22279
parents 5567b773 2ad9b532
---
title: Add trial counters to usage ping
merge_request: 22279
author:
type: added
...@@ -32,6 +32,7 @@ module EE ...@@ -32,6 +32,7 @@ module EE
def features_usage_data_ee def features_usage_data_ee
{ {
elasticsearch_enabled: ::Gitlab::CurrentSettings.elasticsearch_search?, elasticsearch_enabled: ::Gitlab::CurrentSettings.elasticsearch_search?,
license_trial_ends_on: License.trial_ends_on,
geo_enabled: ::Gitlab::Geo.enabled? geo_enabled: ::Gitlab::Geo.enabled?
} }
end end
......
...@@ -56,6 +56,7 @@ describe Gitlab::UsageData do ...@@ -56,6 +56,7 @@ describe Gitlab::UsageData do
license_id license_id
elasticsearch_enabled elasticsearch_enabled
geo_enabled geo_enabled
license_trial_ends_on
)) ))
end end
...@@ -133,6 +134,7 @@ describe Gitlab::UsageData do ...@@ -133,6 +134,7 @@ describe Gitlab::UsageData do
it 'gathers feature usage data of EE' do it 'gathers feature usage data of EE' do
expect(subject[:elasticsearch_enabled]).to eq(Gitlab::CurrentSettings.elasticsearch_search?) expect(subject[:elasticsearch_enabled]).to eq(Gitlab::CurrentSettings.elasticsearch_search?)
expect(subject[:geo_enabled]).to eq(Gitlab::Geo.enabled?) expect(subject[:geo_enabled]).to eq(Gitlab::Geo.enabled?)
expect(subject[:license_trial_ends_on]).to eq(License.trial_ends_on)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment