diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-30 14:41:46 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-30 14:41:46 +0000 |
| commit | a8c97187f07cc4feeec9347967a12680cf5aec37 (patch) | |
| tree | 58a72458ca83ee05f32b92b8db24f3b76880057f /lib/api/projects.rb | |
| parent | 2c977029feb756955235f16a06e46d20adb1f557 (diff) | |
| parent | cda2c5e76f18ff773ed0cac548bbf5d62a9adb26 (diff) | |
| download | gitlab-ce-a8c97187f07cc4feeec9347967a12680cf5aec37.tar.gz | |
Merge branch 'dm-api-projects-members-preload' into 'master'
Only preload member records for the relevant projects/groups/user in projects API
See merge request gitlab-org/gitlab-ce!18945
Diffstat (limited to 'lib/api/projects.rb')
| -rw-r--r-- | lib/api/projects.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 8871792060b..3ef3680c5d9 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -58,16 +58,9 @@ module API projects = paginate(projects) projects, options = with_custom_attributes(projects, options) - if current_user - 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( with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails, statistics: params[:statistics], - project_members: project_members, - group_members: group_members, current_user: current_user ) options[:with] = Entities::BasicProjectDetails if params[:simple] |