diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-06 13:12:53 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-06 13:12:53 +0000 |
| commit | b14b31b819f0f09d73e001a80acd528aad913dc9 (patch) | |
| tree | 4e2b22d9188e86f7b70e1be47605ebdb52bb0cb4 /app/models | |
| parent | b62825fd8e9c2215a270675a1209442fd1d38b30 (diff) | |
| parent | de35c044fb5a2def205d9da84e2792c97f40d481 (diff) | |
| download | gitlab-ce-b14b31b819f0f09d73e001a80acd528aad913dc9.tar.gz | |
Merge branch 'bvl-preload-parents-after-pagination' into 'master'
Preload ancestors after pagination when filtering
Closes #40785
See merge request gitlab-org/gitlab-ce!20398
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/group_descendant.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/group_descendant.rb b/app/models/concerns/group_descendant.rb index 261ace57a17..5e9a95c3282 100644 --- a/app/models/concerns/group_descendant.rb +++ b/app/models/concerns/group_descendant.rb @@ -44,8 +44,8 @@ module GroupDescendant This error is not user facing, but causes a +1 query. MSG extras = { - parent: parent, - child: child, + parent: parent.inspect, + child: child.inspect, preloaded: preloaded.map(&:full_path) } issue_url = 'https://gitlab.com/gitlab-org/gitlab-ce/issues/40785' |