Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.0 on 2022-01-18 at 14:00 UTC+1 (a few minutes of down time)

Commit 47409b45 authored by Stan Hu's avatar Stan Hu
Browse files

Merge branch 'bw-fix-ee-dashboard' into 'master'

EE/Geo information paritals not rendered on dashboard

See merge request gitlab-org/gitlab-ce!20276
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- breadcrumb_title "Dashboard" - breadcrumb_title "Dashboard"
%div{ class: container_class } %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 .admin-dashboard.prepend-top-default
.row .row
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
%h3.text-center %h3.text-center
Users: Users:
= approximate_count_with_delimiters(@counts, User) = approximate_count_with_delimiters(@counts, User)
= render_if_exists 'users_statistics' = render_if_exists 'admin/dashboard/users_statistics'
%hr %hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new" = link_to 'New user', new_admin_user_path, class: "btn btn-new"
.col-sm-4 .col-sm-4
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
%span.light.float-right %span.light.float-right
= boolean_to_icon Gitlab::IncomingEmail.enabled? = boolean_to_icon Gitlab::IncomingEmail.enabled?
= render_if_exists 'elastic_and_geo' = render_if_exists 'admin/dashboard/elastic_and_geo'
- container_reg = "Container Registry" - container_reg = "Container Registry"
%p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") } %p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") }
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
%span.float-right %span.float-right
= Gitlab::Pages::VERSION = Gitlab::Pages::VERSION
= render_if_exists 'geo' = render_if_exists 'admin/dashboard/geo'
%p %p
Ruby Ruby
......
---
title: Restore showing Elasticsearch and Geo status on dashboard
merge_request: 20276
author:
type: fixed
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