File tree 4 files changed +5
-0
lines changed
4 files changed +5
-0
lines changed Original file line number Diff line number Diff line change
1
+ source
Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ def self.revision
33
33
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\( \w *\) )}
34
34
SUBDOMAIN_REGEX = %r{\A https://[a-z0-9]+\. gitlab\. com\z }
35
35
VERSION = File . read ( root . join ( "VERSION" ) ) . strip . freeze
36
+ INSTALLATION_TYPE = File . read ( root . join ( "INSTALLATION_TYPE" ) ) . strip . freeze
36
37
37
38
def self . com?
38
39
# Check `gl_subdomain?` as well to keep parity with gitlab.com
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ def license_usage_data
21
21
uuid : Gitlab ::CurrentSettings . uuid ,
22
22
hostname : Gitlab . config . gitlab . host ,
23
23
version : Gitlab ::VERSION ,
24
+ installation_type : Gitlab ::INSTALLATION_TYPE ,
24
25
active_user_count : User . active . count ,
25
26
recorded_at : Time . now ,
26
27
mattermost_enabled : Gitlab . config . mattermost . enabled ,
Original file line number Diff line number Diff line change 32
32
mattermost_enabled
33
33
edition
34
34
version
35
+ installation_type
35
36
uuid
36
37
hostname
37
38
signup
156
157
it "gathers license data" do
157
158
expect ( subject [ :uuid ] ) . to eq ( Gitlab ::CurrentSettings . uuid )
158
159
expect ( subject [ :version ] ) . to eq ( Gitlab ::VERSION )
160
+ expect ( subject [ :installation_type ] ) . to eq ( Gitlab ::INSTALLATION_TYPE )
159
161
expect ( subject [ :active_user_count ] ) . to eq ( User . active . count )
160
162
expect ( subject [ :recorded_at ] ) . to be_a ( Time )
161
163
end
You can’t perform that action at this time.
0 commit comments