summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-08-22 17:04:58 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2017-08-22 17:06:02 +0200
commit7e1901ababf3897e3e54c6dd337e215b696bcecd (patch)
treeead60c3aa084812b0519d3d55f9e821284ccc779
parente6f20e52f6f77f77942c047dca91d3e325cce8b2 (diff)
downloadgitlab-ce-remove-page-numbers-project-dashboards.tar.gz
Disable page numbers for all project dashboardsremove-page-numbers-project-dashboards
This disables page number based pagination for all project dashboards, instead of only doing so for the "Explore Projects" page. This removes the need for running expensive COUNT(*) queries (depending on how many projects you have access to) and keeps the pagination consistent on the various project dashboard pages.
-rw-r--r--app/controllers/dashboard/projects_controller.rb8
-rw-r--r--changelogs/unreleased/remove-page-numbers-project-dashboards.yml5
2 files changed, 11 insertions, 2 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index f71ab702e71..7209e6233cc 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -5,7 +5,9 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
before_action :default_sorting
def index
- @projects = load_projects(params.merge(non_public: true)).page(params[:page])
+ @projects = load_projects(params.merge(non_public: true))
+ .page(params[:page])
+ .without_count
respond_to do |format|
format.html
@@ -23,7 +25,9 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
def starred
@projects = load_projects(params.merge(starred: true))
- .includes(:forked_from_project, :tags).page(params[:page])
+ .includes(:forked_from_project, :tags)
+ .page(params[:page])
+ .without_count
@groups = []
diff --git a/changelogs/unreleased/remove-page-numbers-project-dashboards.yml b/changelogs/unreleased/remove-page-numbers-project-dashboards.yml
new file mode 100644
index 00000000000..377e0ee4cac
--- /dev/null
+++ b/changelogs/unreleased/remove-page-numbers-project-dashboards.yml
@@ -0,0 +1,5 @@
+---
+title: Disable page numbers for all project dashboards
+merge_request:
+author:
+type: other