diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:14 +0000 |
commit | b3baf6f55132daab34c6bc9b6d98826dbee4fea9 (patch) | |
tree | dc34cd3d4f7411879536377f8354c042aa789d63 /app | |
parent | 4682f5015a5a2d7eedb66b3c90aee931d3789d0b (diff) | |
download | gitlab-ce-b3baf6f55132daab34c6bc9b6d98826dbee4fea9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 5 | ||||
-rw-r--r-- | app/views/admin/dashboard/index.html.haml | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index c36bbaab23b..f24ce9b5d03 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -2,6 +2,7 @@ class Admin::DashboardController < Admin::ApplicationController include CountHelper + helper_method :show_license_breakdown? COUNTED_ITEMS = [Project, User, Group].freeze @@ -13,6 +14,10 @@ class Admin::DashboardController < Admin::ApplicationController @groups = Group.order_id_desc.with_route.limit(10) end # rubocop: enable CodeReuse/ActiveRecord + + def show_license_breakdown? + false + end end Admin::DashboardController.prepend_if_ee('EE::Admin::DashboardController') diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 2b913808c2f..41147950c40 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -1,6 +1,7 @@ - breadcrumb_title "Dashboard" -= render_if_exists 'admin/licenses/breakdown', license: @license +- if show_license_breakdown? + = render_if_exists 'admin/licenses/breakdown', license: @license .admin-dashboard.prepend-top-default .row |