diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-05-28 10:36:26 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-05-28 10:36:26 +0000 |
| commit | 265b1fafe64ae9fe8a3e92d83c1678b47533ba86 (patch) | |
| tree | 414c5cdbcda463cb9061f3c9f29289140d3e46e2 /app/controllers | |
| parent | 3ab3838346ec6437bbd655417f021f8f0e7a9855 (diff) | |
| parent | b6125f7045d2bed4aadf798dde4c547e2047e039 (diff) | |
| download | gitlab-ce-265b1fafe64ae9fe8a3e92d83c1678b47533ba86.tar.gz | |
Merge branch 'sh-fix-admin-page-counts-take-2' into 'master'
Fix fast admin counters not working when PostgreSQL has secondaries
Closes #46742
See merge request gitlab-org/gitlab-ce!19154
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index d6a6bc7d4a1..737942f3eb2 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -1,7 +1,11 @@ class Admin::DashboardController < Admin::ApplicationController include CountHelper + COUNTED_ITEMS = [Project, User, Group, ForkedProjectLink, Issue, MergeRequest, + Note, Snippet, Key, Milestone].freeze + def index + @counts = Gitlab::Database::Count.approximate_counts(COUNTED_ITEMS) @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) |