Merge branch 'active-users' into 'master'

Show active users(non-blocked) on admin dashboard

For gitlab/gitlab-ee#248

See merge request !1656
This commit is contained in:
Dmitriy Zaporozhets
2015-03-09 05:31:47 +00:00
+2 -2
View File
@@ -32,9 +32,9 @@
%span.light.pull-right
= Milestone.count
%p
Users who signed in during last 30 days
Active Users
%span.light.pull-right
= User.where("current_sign_in_at > ?", 30.days.ago).count
= User.active.count
.col-md-4
%h4
Features