diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-12 10:40:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-12 10:40:50 +0000 |
| commit | 7e992b0be12da8906da04dd4c11c4ae2b01299bc (patch) | |
| tree | f5ee2949fdcd63bb0f64772b4bd2804f82506829 | |
| parent | 0d3f6a54883337c3e7d0e705674908ba65be57dc (diff) | |
| parent | 615ba0071a8bcd3da93f6c27e45128af865cc7bb (diff) | |
| download | gitlab-ce-7e992b0be12da8906da04dd4c11c4ae2b01299bc.tar.gz | |
Merge branch 'dashboards-projects-controller' into 'master'
Eager load namespace owners for project dashboards
Closes #27376
See merge request !14188
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/dashboards-projects-controller.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index f71ab702e71..cd94a36a6e7 100644 --- 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 diff --git a/changelogs/unreleased/dashboards-projects-controller.yml b/changelogs/unreleased/dashboards-projects-controller.yml new file mode 100644 index 00000000000..8b350f70a80 --- /dev/null +++ b/changelogs/unreleased/dashboards-projects-controller.yml @@ -0,0 +1,5 @@ +--- +title: Eager load namespace owners for project dashboards +merge_request: +author: +type: other |