Commit 12c1dce5 authored by Balasankar "Balu" C's avatar Balasankar "Balu" C

type is a reserved keyword, use installation_type instead

parent 3dcb3857
...@@ -21,7 +21,7 @@ module Gitlab ...@@ -21,7 +21,7 @@ module Gitlab
uuid: Gitlab::CurrentSettings.uuid, uuid: Gitlab::CurrentSettings.uuid,
hostname: Gitlab.config.gitlab.host, hostname: Gitlab.config.gitlab.host,
version: Gitlab::VERSION, version: Gitlab::VERSION,
type: Gitlab::TYPE, installation_type: Gitlab::TYPE,
active_user_count: User.active.count, active_user_count: User.active.count,
recorded_at: Time.now, recorded_at: Time.now,
mattermost_enabled: Gitlab.config.mattermost.enabled, mattermost_enabled: Gitlab.config.mattermost.enabled,
......
...@@ -43,7 +43,7 @@ describe Gitlab::UsageData do ...@@ -43,7 +43,7 @@ describe Gitlab::UsageData do
mattermost_enabled mattermost_enabled
edition edition
version version
type installation_type
uuid uuid
hostname hostname
signup signup
...@@ -191,7 +191,7 @@ describe Gitlab::UsageData do ...@@ -191,7 +191,7 @@ describe Gitlab::UsageData do
expect(subject[:license_id]).to eq(license.license_id) expect(subject[:license_id]).to eq(license.license_id)
expect(subject[:version]).to eq(Gitlab::VERSION) expect(subject[:version]).to eq(Gitlab::VERSION)
expect(subject[:licensee]).to eq(license.licensee) expect(subject[:licensee]).to eq(license.licensee)
expect(subject[:type]).to eq(Gitlab::TYPE) expect(subject[:installation_type]).to eq(Gitlab::TYPE)
expect(subject[:active_user_count]).to eq(User.active.count) expect(subject[:active_user_count]).to eq(User.active.count)
expect(subject[:licensee]).to eq(license.licensee) expect(subject[:licensee]).to eq(license.licensee)
expect(subject[:license_user_count]).to eq(license.restricted_user_count) expect(subject[:license_user_count]).to eq(license.restricted_user_count)
......
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