Commit 81c6ade5 authored by Yorick Peterse's avatar Yorick Peterse

Move EE code out of Gitlab::UsageData

This moves EE specific code out of Gitlab::UsageData and into
EE::Gitlab::UsageData. We also remove the overriding of the "CE" string
with "EE", because EE::Gitlab::UsageData already overrides this with its
own value.
parent 42af0001
This diff is collapsed.
......@@ -5,8 +5,6 @@ module Gitlab
APPROXIMATE_COUNT_MODELS = [Label, MergeRequest, Note, Todo].freeze
class << self
prepend EE::Gitlab::UsageData # rubocop: disable Cop/InjectEnterpriseEditionModule
def data(force_refresh: false)
Rails.cache.fetch('usage_data', force: force_refresh, expires_in: 2.weeks) { uncached_data }
end
......@@ -31,7 +29,7 @@ module Gitlab
installation_type: Gitlab::INSTALLATION_TYPE,
active_user_count: count(User.active),
recorded_at: Time.now,
edition: 'EE'
edition: 'CE'
}
usage_data
......@@ -192,3 +190,5 @@ module Gitlab
end
end
end
Gitlab::UsageData.prepend(EE::Gitlab::UsageData)
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