Merge branch '40492-update-admin-dashboard-content-order' into 'master'

Move row containing Projects, Users and Groups count to the top

Closes #40492

See merge request gitlab-org/gitlab-ce!16421
This commit is contained in:
Annabel Dunstone Gray 2018-01-12 19:46:38 +00:00
commit e4aa2bd30f
2 changed files with 33 additions and 28 deletions

View File

@ -3,6 +3,34 @@
%div{ class: container_class }
.admin-dashboard.prepend-top-default
.row
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
= link_to admin_projects_path do
%h3.text-center
Projects:
= number_with_delimiter(Project.cached_count)
%hr
= link_to('New project', new_project_path, class: "btn btn-new")
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
= link_to admin_users_path do
%h3.text-center
Users:
= number_with_delimiter(User.count)
%hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new"
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
= link_to admin_groups_path do
%h3.text-center
Groups:
= number_with_delimiter(Group.count)
%hr
= link_to 'New group', new_admin_group_path, class: "btn btn-new"
.row
.col-md-4
.info-well
@ -135,34 +163,6 @@
= Gitlab::Database.adapter_name
%span.pull-right
= Gitlab::Database.version
.row
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
= link_to admin_projects_path do
%h3.text-center
Projects:
= number_with_delimiter(Project.cached_count)
%hr
= link_to('New project', new_project_path, class: "btn btn-new")
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
= link_to admin_users_path do
%h3.text-center
Users:
= number_with_delimiter(User.count)
%hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new"
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
= link_to admin_groups_path do
%h3.text-center
Groups:
= number_with_delimiter(Group.count)
%hr
= link_to 'New group', new_admin_group_path, class: "btn btn-new"
.row
.col-md-4
.info-well

View File

@ -0,0 +1,5 @@
---
title: Move row containing Projects, Users and Groups count to the top in admin dashboard
merge_request: 16421
author:
type: changed