Rename to INSTALLATION_TYPE
This commit is contained in:
parent
12c1dce5fd
commit
06f159f9b9
|
@ -33,7 +33,7 @@ def self.revision
|
|||
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
|
||||
SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
|
||||
VERSION = File.read(root.join("VERSION")).strip.freeze
|
||||
TYPE = File.read(root.join("TYPE")).strip.freeze
|
||||
INSTALLATION_TYPE = File.read(root.join("INSTALLATION_TYPE")).strip.freeze
|
||||
|
||||
def self.com?
|
||||
# Check `gl_subdomain?` as well to keep parity with gitlab.com
|
||||
|
|
|
@ -21,7 +21,7 @@ def license_usage_data
|
|||
uuid: Gitlab::CurrentSettings.uuid,
|
||||
hostname: Gitlab.config.gitlab.host,
|
||||
version: Gitlab::VERSION,
|
||||
installation_type: Gitlab::TYPE,
|
||||
installation_type: Gitlab::INSTALLATION_TYPE,
|
||||
active_user_count: User.active.count,
|
||||
recorded_at: Time.now,
|
||||
mattermost_enabled: Gitlab.config.mattermost.enabled,
|
||||
|
|
|
@ -191,7 +191,7 @@
|
|||
expect(subject[:license_id]).to eq(license.license_id)
|
||||
expect(subject[:version]).to eq(Gitlab::VERSION)
|
||||
expect(subject[:licensee]).to eq(license.licensee)
|
||||
expect(subject[:installation_type]).to eq(Gitlab::TYPE)
|
||||
expect(subject[:installation_type]).to eq(Gitlab::INSTALLATION_TYPE)
|
||||
expect(subject[:active_user_count]).to eq(User.active.count)
|
||||
expect(subject[:licensee]).to eq(license.licensee)
|
||||
expect(subject[:license_user_count]).to eq(license.restricted_user_count)
|
||||
|
|
Loading…
Reference in a new issue