summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-01-19 10:10:15 +0000
committerJames Lopez <james@jameslopez.es>2017-01-19 11:14:53 +0100
commit8cd7b23cf2d6b51f16dc5dfb17d0d170aea90860 (patch)
treecea2f432d6cedd882b6b5f321f139f1c201e0ddc
parentd9bdd1303713b1559649b21b7493978f09ad9673 (diff)
downloadgitlab-ce-8cd7b23cf2d6b51f16dc5dfb17d0d170aea90860.tar.gz
Merge branch 'speed-up-dashboard-milestone-index' into 'master'
Speed up dashboard milestone index by scoping IssuesFinder to user authorized projects See merge request !8524
-rw-r--r--app/controllers/dashboard/milestones_controller.rb4
-rw-r--r--app/models/dashboard_milestone.rb5
-rw-r--r--changelogs/unreleased/speed-up-dashboard-milestone-index.yml5
3 files changed, 12 insertions, 2 deletions
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index 7051652d109..7f506db583f 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -19,11 +19,11 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
private
def milestones
- @milestones = GlobalMilestone.build_collection(@projects, params)
+ @milestones = DashboardMilestone.build_collection(@projects, params)
end
def milestone
- @milestone = GlobalMilestone.build(@projects, params[:title])
+ @milestone = DashboardMilestone.build(@projects, params[:title])
render_404 unless @milestone
end
end
diff --git a/app/models/dashboard_milestone.rb b/app/models/dashboard_milestone.rb
new file mode 100644
index 00000000000..646c1e5ce1a
--- /dev/null
+++ b/app/models/dashboard_milestone.rb
@@ -0,0 +1,5 @@
+class DashboardMilestone < GlobalMilestone
+ def issues_finder_params
+ { authorized_only: true }
+ end
+end
diff --git a/changelogs/unreleased/speed-up-dashboard-milestone-index.yml b/changelogs/unreleased/speed-up-dashboard-milestone-index.yml
new file mode 100644
index 00000000000..ba4ff931ea8
--- /dev/null
+++ b/changelogs/unreleased/speed-up-dashboard-milestone-index.yml
@@ -0,0 +1,5 @@
+---
+title: Speed up dashboard milestone index by scoping IssuesFinder to user authorized
+ projects
+merge_request: 8524
+author: