diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-30 07:03:34 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-06-30 07:03:34 +0300 |
| commit | 3a3233a5b9e4be15bedd9004c8520475fd38f5c5 (patch) | |
| tree | 76882295d2940187bcee736df44b44451cbb28c7 | |
| parent | 854d39ad61424c4f2c186923fbc679a9bf55dedd (diff) | |
| parent | bd2e41aa61e0ef9b591e52f1e60ea363cefefe2c (diff) | |
Merge branch 'bw-fix-ee-dashboard' into 'master'
EE/Geo information paritals not rendered on dashboard
See merge request gitlab-org/gitlab-ce!20276
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/bw-fix-ee-dashboard.yml | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 3cdeb103bb8..18f2c1a509f 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 00000000000..667181cdf73 --- /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 |