From bd2e41aa61e0ef9b591e52f1e60ea363cefefe2c Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Fri, 29 Jun 2018 16:20:14 -0500
Subject: [PATCH] namespace partial paths on dashboard
---
app/views/admin/dashboard/index.html.haml | 8 ++++----
changelogs/unreleased/bw-fix-ee-dashboard.yml | 5 +++++
2 files changed, 9 insertions(+), 4 deletions(-)
create mode 100644 changelogs/unreleased/bw-fix-ee-dashboard.yml
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 3cdeb103bb806..18f2c1a509f78 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -2,7 +2,7 @@
- breadcrumb_title "Dashboard"
%div{ class: container_class }
- = render_if_exists "admin/licenses/breakdown", license: @license
+ = render_if_exists 'admin/licenses/breakdown', license: @license
.admin-dashboard.prepend-top-default
.row
@@ -22,7 +22,7 @@
%h3.text-center
Users:
= approximate_count_with_delimiters(@counts, User)
- = render_if_exists 'users_statistics'
+ = render_if_exists 'admin/dashboard/users_statistics'
%hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new"
.col-sm-4
@@ -101,7 +101,7 @@
%span.light.float-right
= boolean_to_icon Gitlab::IncomingEmail.enabled?
- = render_if_exists 'elastic_and_geo'
+ = render_if_exists 'admin/dashboard/elastic_and_geo'
- container_reg = "Container Registry"
%p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") }
@@ -151,7 +151,7 @@
%span.float-right
= Gitlab::Pages::VERSION
- = render_if_exists 'geo'
+ = render_if_exists 'admin/dashboard/geo'
%p
Ruby
diff --git a/changelogs/unreleased/bw-fix-ee-dashboard.yml b/changelogs/unreleased/bw-fix-ee-dashboard.yml
new file mode 100644
index 0000000000000..667181cdf7345
--- /dev/null
+++ b/changelogs/unreleased/bw-fix-ee-dashboard.yml
@@ -0,0 +1,5 @@
+---
+title: Restore showing Elasticsearch and Geo status on dashboard
+merge_request: 20276
+author:
+type: fixed
--
GitLab