Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-05-23 22:45:32 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-05-23 22:45:32 +0300
commit51d455d05bfbdba5fac62c799703bd50fe7d70e4 (patch)
treea886df6d419378607d4fdf10112f79914613ed32 /app/views/admin/dashboard
parentee16cf15baca0405b0db2db029c0538d8496864f (diff)
parent6c51e220ef2774447038a909c4f22ff90eb624fb (diff)
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/views/admin/dashboard')
-rw-r--r--app/views/admin/dashboard/index.html.haml9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index afb65f6438f..2eca6676164 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -2,6 +2,8 @@
- breadcrumb_title "Dashboard"
%div{ class: container_class }
+ = render_if_exists "admin/licenses/breakdown", license: @license
+
.admin-dashboard.prepend-top-default
.row
.col-sm-4
@@ -20,6 +22,7 @@
%h3.text-center
Users:
= approximate_count_with_delimiters(User)
+ = render_if_exists 'users_statistics'
%hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new"
.col-sm-4
@@ -97,6 +100,9 @@
= reply_email
%span.light.float-right
= boolean_to_icon Gitlab::IncomingEmail.enabled?
+
+ = render_if_exists 'elastic_and_geo'
+
- container_reg = "Container Registry"
%p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") }
= container_reg
@@ -144,6 +150,9 @@
GitLab Pages
%span.float-right
= Gitlab::Pages::VERSION
+
+ = render_if_exists 'geo'
+
%p
Ruby
%span.float-right