diff options
| author | Balasankar "Balu" C <balasankar@gitlab.com> | 2018-06-01 14:23:23 +0530 |
|---|---|---|
| committer | Balasankar "Balu" C <balasankar@gitlab.com> | 2018-06-04 12:07:28 +0530 |
| commit | b6159c1fbab94179c3fc2c5db08d3d2c1769332f (patch) | |
| tree | fe1c6924d360379db6f5fd27d54cde28c5eca75a | |
| parent | af98c9946e40b904b1bf94ba8b5253d8efabf667 (diff) | |
| download | gitlab-ce-install-type.tar.gz | |
Rename to INSTALLATION_TYPEinstall-type
| -rw-r--r-- | INSTALLATION_TYPE (renamed from TYPE) | 0 | ||||
| -rw-r--r-- | lib/gitlab.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/TYPE b/INSTALLATION_TYPE index 5a18cd2fbf6..5a18cd2fbf6 100644 --- a/TYPE +++ b/INSTALLATION_TYPE diff --git a/lib/gitlab.rb b/lib/gitlab.rb index e1e15647bbf..b9a148f35bf 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -33,7 +33,7 @@ module Gitlab 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 diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 1547e8293d0..59a222b086c 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -21,7 +21,7 @@ module Gitlab 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, diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index fb2f799ab14..22d921716aa 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -157,7 +157,7 @@ describe Gitlab::UsageData do it "gathers license data" do expect(subject[:uuid]).to eq(Gitlab::CurrentSettings.uuid) expect(subject[:version]).to eq(Gitlab::VERSION) - 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[:recorded_at]).to be_a(Time) end |