diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-12-04 15:45:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-12-04 15:45:43 +0000 |
| commit | 65b7a7a0632280c77de1dc9d6c93dfb5df0c2fc9 (patch) | |
| tree | b86d2e81c4d550d89906654d5bd378b93d5654d0 /lib/api/projects.rb | |
| parent | 6a27f9b1b234470a994b0b43460bd9c8097ae12f (diff) | |
| parent | 264171f72d4ef3e5dfafaf32d3d267ab279469e1 (diff) | |
| download | gitlab-ce-65b7a7a0632280c77de1dc9d6c93dfb5df0c2fc9.tar.gz | |
Merge branch 'sh-optimize-groups-api' into 'master'
Optimize API /groups/:id/projects by preloading assocations
Closes #40308
See merge request gitlab-org/gitlab-ce!15475
Diffstat (limited to 'lib/api/projects.rb')
| -rw-r--r-- | lib/api/projects.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 4cd7e714aa2..14a4fc6f025 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -79,11 +79,11 @@ module API projects = projects.with_statistics if params[:statistics] projects = projects.with_issues_enabled if params[:with_issues_enabled] projects = projects.with_merge_requests_enabled if params[:with_merge_requests_enabled] + projects = paginate(projects) if current_user - projects = projects.includes(:route, :taggings, namespace: :route) - project_members = current_user.project_members - group_members = current_user.group_members + project_members = current_user.project_members.preload(:source, user: [notification_settings: :source]) + group_members = current_user.group_members.preload(:source, user: [notification_settings: :source]) end options = options.reverse_merge( @@ -95,7 +95,7 @@ module API ) options[:with] = Entities::BasicProjectDetails if params[:simple] - present paginate(projects), options + present options[:with].prepare_relation(projects, options), options end end |