Merge branch 'dashboards-projects-controller' into 'master'

Eager load namespace owners for project dashboards Closes #27376 See merge request !14188

Merge branch 'dashboards-projects-controller' into 'master'
9db5bfb7 · Rémy Coutable · Jarka Kadlecova · af326e23 · 9db5bfb7 · 9db5bfb7
Commit 9db5bfb7 authored Sep 12, 2017 by Rémy Coutable Committed by Jarka Kadlecova Sep 12, 2017
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

projects_controller.rb app/controllers/dashboard/projects_controller.rb +1 -1

dashboards-projects-controller.yml changelogs/unreleased/dashboards-projects-controller.yml +5 -0

No files found.
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -48,7 +48,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
    ProjectsFinder
      .new(params: finder_params, current_user: current_user)
      .execute
-      .includes(:route, :creator, namespace: :route)
+      .includes(:route, :creator, namespace: [:route, :owner])
  end

  def load_events

--- a/changelogs/unreleased/dashboards-projects-controller.yml
+++ b/changelogs/unreleased/dashboards-projects-controller.yml
+---
+title: Eager load namespace owners for project dashboards
+merge_request:
+author:
+type: other