summaryrefslogtreecommitdiff
path: root/app/views/admin/dashboard
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 18:42:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 18:42:06 +0000
commit6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch)
tree78be5963ec075d80116a932011d695dd33910b4e /app/views/admin/dashboard
parent1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff)
downloadgitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/views/admin/dashboard')
-rw-r--r--app/views/admin/dashboard/index.html.haml6
-rw-r--r--app/views/admin/dashboard/stats.html.haml2
2 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 7c6c21bc509..271ab12037e 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -1,15 +1,15 @@
- breadcrumb_title _("Dashboard")
- page_title _("Dashboard")
-- if show_license_breakdown?
- = render_if_exists 'admin/licenses/breakdown', license: @license
-
- if @notices
- @notices.each do |notice|
.js-vue-alert{ 'v-cloak': true, data: { variant: notice[:type],
dismissible: true.to_s } }
= notice[:message].html_safe
+- if show_license_breakdown?
+ = render_if_exists 'admin/licenses/breakdown', license: @license
+
.admin-dashboard.gl-mt-3
.row
.col-sm-4
diff --git a/app/views/admin/dashboard/stats.html.haml b/app/views/admin/dashboard/stats.html.haml
index f7f2c717308..78707235cb5 100644
--- a/app/views/admin/dashboard/stats.html.haml
+++ b/app/views/admin/dashboard/stats.html.haml
@@ -2,7 +2,7 @@
%h3.my-4
= s_('AdminArea|Users statistics')
-%table.table.gl-text-gray-700
+%table.table.gl-text-gray-500
%tr
%td.p-3
= s_('AdminArea|Users without a Group and Project')