summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-15 10:36:41 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-15 10:36:41 +0000
commitda4c13f11d717c08936b0ee5f3df7e87aaa5961b (patch)
tree56e44894a3a8a2a95d2010a2ff7d0d194402ab35 /app/views
parentca0691ca8ee7e3de15eef8c3f9a738a5f6160556 (diff)
parentb0114867311652e32868e8f48b9c268a712367bf (diff)
downloadgitlab-ce-da4c13f11d717c08936b0ee5f3df7e87aaa5961b.tar.gz
Merge branch 'active-users' into 'master'
Active users Show the number of active users in the dashboard.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/dashboard/index.html.haml4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index bbd60bc6224..41760f8b1e3 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -93,6 +93,10 @@
Milestones
%span.light.pull-right
= Milestone.count
+ %p
+ Monthly active users
+ %span.light.pull-right
+ = User.where("current_sign_in_at > ?", 30.days.ago).count
.col-md-4
%h4
Features