diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-21 09:41:27 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-21 09:41:27 +0000 |
commit | 60f51cd20af5db8759c31c32a9c45db5b5be2199 (patch) | |
tree | 336f6719daf795ea86194006ec1f3be6ea9a0807 /lib | |
parent | 94da20fde1a08c8c35c1de350b31f30185a9007b (diff) | |
parent | 727bba8ef5840501a83f4e2fc5f895530079c264 (diff) | |
download | gitlab-ce-60f51cd20af5db8759c31c32a9c45db5b5be2199.tar.gz |
Merge branch 'da-usage-ping' into 'master'
Add enabled prefix to feature keys to be consistent with other keys
See merge request gitlab-org/gitlab-ce!20043
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/usage_data.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 59a222b086c..dff0c97eeb4 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -24,7 +24,6 @@ module Gitlab installation_type: Gitlab::INSTALLATION_TYPE, active_user_count: User.active.count, recorded_at: Time.now, - mattermost_enabled: Gitlab.config.mattermost.enabled, edition: 'CE' } @@ -91,13 +90,14 @@ module Gitlab def features_usage_data_ce { - signup: Gitlab::CurrentSettings.allow_signup?, - ldap: Gitlab.config.ldap.enabled, - gravatar: Gitlab::CurrentSettings.gravatar_enabled?, - omniauth: Gitlab.config.omniauth.enabled, - reply_by_email: Gitlab::IncomingEmail.enabled?, - container_registry: Gitlab.config.registry.enabled, - gitlab_shared_runners: Gitlab.config.gitlab_ci.shared_runners_enabled + container_registry_enabled: Gitlab.config.registry.enabled, + gitlab_shared_runners_enabled: Gitlab.config.gitlab_ci.shared_runners_enabled, + gravatar_enabled: Gitlab::CurrentSettings.gravatar_enabled?, + ldap_enabled: Gitlab.config.ldap.enabled, + mattermost_enabled: Gitlab.config.mattermost.enabled, + omniauth_enabled: Gitlab.config.omniauth.enabled, + reply_by_email_enabled: Gitlab::IncomingEmail.enabled?, + signup_enabled: Gitlab::CurrentSettings.allow_signup? } end |