Commit dbb514e7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'active-users' into 'master'

Show active users(non-blocked) on admin dashboard

For gitlab/gitlab-ee#248

See merge request !1656
parents 6187670f bb9560a3
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
%span.light.pull-right %span.light.pull-right
= Milestone.count = Milestone.count
%p %p
Users who signed in during last 30 days Active Users
%span.light.pull-right %span.light.pull-right
= User.where("current_sign_in_at > ?", 30.days.ago).count = User.active.count
.col-md-4 .col-md-4
%h4 %h4
Features Features
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment