Commit 5d90aef3 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'ee-unify-admin-controllers' into 'master'

EE:  Unify some admin controllers

See merge request gitlab-org/gitlab-ee!6267
parents c9ca0799 133f4613
......@@ -11,6 +11,5 @@ class Admin::DashboardController < Admin::ApplicationController
@projects = Project.order_id_desc.without_deleted.with_route.limit(10)
@users = User.order_id_desc.limit(10)
@groups = Group.order_id_desc.with_route.limit(10)
@license = License.current
end
end
......@@ -3,6 +3,14 @@ module EE
module Admin
module DashboardController
extend ActiveSupport::Concern
extend ::Gitlab::Utils::Override
override :index
def index
super
@license = License.current
end
def stats
@admin_count = ::User.admins.count
......
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