summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-08 17:30:01 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-08 17:30:01 -0700
commitbb7be246f6928368d0bdadfb7a3258d610d48252 (patch)
treefc32614817b58d355e71dc6cf801817711e89fee /app
parent8b551ee31858db9c5da1ff5245359151d5b71211 (diff)
downloadgitlab-ce-bb7be246f6928368d0bdadfb7a3258d610d48252.tar.gz
Show active users(non-blocked) on admin dashboard
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/dashboard/index.html.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 931b0c5c107..34e4e336261 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -32,9 +32,9 @@
%span.light.pull-right
= Milestone.count
%p
- Users who signed in during last 30 days
+ Users
%span.light.pull-right
- = User.where("current_sign_in_at > ?", 30.days.ago).count
+ = User.count
.col-md-4
%h4
Features
@@ -91,10 +91,10 @@
= link_to('New Project', new_project_path, class: "btn btn-new")
.col-sm-4
.light-well
- %h4 Users
+ %h4 Active Users
.data
= link_to admin_users_path do
- %h1= User.count
+ %h1= User.active.count
%hr
= link_to 'New User', new_admin_user_path, class: "btn btn-new"
.col-sm-4