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
8d8c6ced
Commit
8d8c6ced
authored
Jul 16, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be consistent and make active_users active_user_count
parent
0a3f398a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/workers/gitlab_usage_ping_worker.rb
app/workers/gitlab_usage_ping_worker.rb
+1
-1
spec/workers/gitlab_usage_ping_worker_spec.rb
spec/workers/gitlab_usage_ping_worker_spec.rb
+1
-1
No files found.
app/workers/gitlab_usage_ping_worker.rb
View file @
8d8c6ced
...
...
@@ -30,7 +30,7 @@ class GitlabUsagePingWorker
def
data
usage_data
=
{
version:
Gitlab
::
VERSION
,
active_user
s
:
current_active_user_count
}
active_user
_count
:
current_active_user_count
}
license
=
License
.
current
if
license
...
...
spec/workers/gitlab_usage_ping_worker_spec.rb
View file @
8d8c6ced
...
...
@@ -10,7 +10,7 @@ describe GitlabUsagePingWorker do
expect
(
data
[
:license_md5
]).
to
eq
(
Digest
::
MD5
.
hexdigest
(
license
.
data
))
expect
(
data
[
:version
]).
to
eq
(
Gitlab
::
VERSION
)
expect
(
data
[
:licensee
]).
to
eq
(
license
.
licensee
)
expect
(
data
[
:active_user
s
]).
to
eq
(
User
.
active
.
count
)
expect
(
data
[
:active_user
_count
]).
to
eq
(
User
.
active
.
count
)
expect
(
data
[
:licensee
]).
to
eq
(
license
.
licensee
)
expect
(
data
[
:license_user_count
]).
to
eq
(
license
.
user_count
)
expect
(
data
[
:license_starts_at
]).
to
eq
(
license
.
starts_at
)
...
...
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