Commit 6ea95c9b authored by James Lopez's avatar James Lopez

Merge branch 'remove_admin_count_from_users_statistics' into 'master'

Remove admin user count from Users statistics

See merge request gitlab-org/gitlab!25337
parents 37d57302 0a042893
...@@ -17,7 +17,6 @@ module EE ...@@ -17,7 +17,6 @@ module EE
end end
def stats def stats
@admin_count = ::User.admins.count
@roles_count = ::ProjectAuthorization.roles_stats @roles_count = ::ProjectAuthorization.roles_stats
end end
......
...@@ -7,12 +7,6 @@ ...@@ -7,12 +7,6 @@
%td %td
= User.count = User.count
- if @admin_count
%tr
%td Admin users
%td
= @admin_count
- if @roles_count - if @roles_count
- @roles_count.each do |row| - @roles_count.each do |row|
%tr %tr
......
---
title: Remove admin user count from Users statistics
merge_request: 25337
author:
type: changed
...@@ -24,7 +24,6 @@ describe 'Admin Dashboard' do ...@@ -24,7 +24,6 @@ describe 'Admin Dashboard' do
it 'show correct amount of users per role' do it 'show correct amount of users per role' do
visit admin_dashboard_stats_path visit admin_dashboard_stats_path
expect(page).to have_content('Admin users 1')
expect(page).to have_content('Users with highest role developer 2') expect(page).to have_content('Users with highest role developer 2')
expect(page).to have_content('Users with highest role reporter 1') expect(page).to have_content('Users with highest role reporter 1')
end end
......
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