Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
12c1dce5
Commit
12c1dce5
authored
Jun 01, 2018
by
Balasankar "Balu" C
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
type is a reserved keyword, use installation_type instead
parent
3dcb3857
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/usage_data.rb
lib/gitlab/usage_data.rb
+1
-1
spec/lib/gitlab/usage_data_spec.rb
spec/lib/gitlab/usage_data_spec.rb
+2
-2
No files found.
lib/gitlab/usage_data.rb
View file @
12c1dce5
...
...
@@ -21,7 +21,7 @@ module Gitlab
uuid:
Gitlab
::
CurrentSettings
.
uuid
,
hostname:
Gitlab
.
config
.
gitlab
.
host
,
version:
Gitlab
::
VERSION
,
type:
Gitlab
::
TYPE
,
installation_
type:
Gitlab
::
TYPE
,
active_user_count:
User
.
active
.
count
,
recorded_at:
Time
.
now
,
mattermost_enabled:
Gitlab
.
config
.
mattermost
.
enabled
,
...
...
spec/lib/gitlab/usage_data_spec.rb
View file @
12c1dce5
...
...
@@ -43,7 +43,7 @@ describe Gitlab::UsageData do
mattermost_enabled
edition
version
type
installation_
type
uuid
hostname
signup
...
...
@@ -191,7 +191,7 @@ describe Gitlab::UsageData do
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
[
: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
[
:licensee
]).
to
eq
(
license
.
licensee
)
expect
(
subject
[
:license_user_count
]).
to
eq
(
license
.
restricted_user_count
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment