diff options
author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-09-25 11:40:24 +0300 |
---|---|---|
committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-09-25 11:40:24 +0300 |
commit | 924885e5cdd221de7e26ad28de8671d281f91b08 (patch) | |
tree | bba71420217dde1a7c1aae5df283750b6e346a35 /lib/gitlab | |
parent | 61a5537ea6d3c72c62838522eb85682cba9daabd (diff) |
Resolves usage-data conflicts
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/usage_data.rb | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index bacb7a51338..86d5aab8360 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -25,7 +25,6 @@ module Gitlab active_user_count: User.active.count, recorded_at: Time.now, mattermost_enabled: Gitlab.config.mattermost.enabled, -<<<<<<< HEAD edition: 'EE' } @@ -43,11 +42,6 @@ module Gitlab usage_data[:license_add_ons] = license.add_ons end -======= - edition: 'CE' - } - ->>>>>>> ce-com/master usage_data end @@ -96,7 +90,6 @@ module Gitlab } end -<<<<<<< HEAD def service_desk_counts return {} unless ::License.feature_available?(:service_desk) @@ -133,31 +126,12 @@ module Gitlab } end -======= - def features_usage_data - features_usage_data_ce - end - - def features_usage_data_ce - { - signup: current_application_settings.signup_enabled?, - ldap: Gitlab.config.ldap.enabled, - gravatar: current_application_settings.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 - } - end - ->>>>>>> ce-com/master def components_usage_data { gitlab_pages: { enabled: Gitlab.config.pages.enabled, version: Gitlab::Pages::VERSION }, git: { version: Gitlab::Git.version }, database: { adapter: Gitlab::Database.adapter_name, version: Gitlab::Database.version } } -<<<<<<< HEAD end def license_edition(plan) @@ -169,8 +143,6 @@ module Gitlab else # Older licenses 'EE' end -======= ->>>>>>> ce-com/master end def services_usage |