diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-09 21:07:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-09 21:07:44 +0300 |
commit | 453634293e24164ffaa5cd708e47a1cebc07bcd3 (patch) | |
tree | e49bb067fc508f57b03ac582872c4b1215eec326 /app/presenters/projects | |
parent | 608d6aaa3d80a33862ca2c29d96bfd687b1a011b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters/projects')
-rw-r--r-- | app/presenters/projects/import_export/project_export_presenter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/presenters/projects/import_export/project_export_presenter.rb b/app/presenters/projects/import_export/project_export_presenter.rb index 53c547cde9e..76cc8242da8 100644 --- a/app/presenters/projects/import_export/project_export_presenter.rb +++ b/app/presenters/projects/import_export/project_export_presenter.rb @@ -17,7 +17,7 @@ module Projects delegator_override :project_members def project_members - super + converted_group_members + super.preload(:user) + converted_group_members # rubocop:disable CodeReuse/ActiveRecord end delegator_override :description @@ -46,7 +46,7 @@ module Projects # invitee, it would make the following query return 0 rows since a NULL # user_id would be present in the subquery non_null_user_ids = project.project_members.connected_to_user.select(:user_id) - GroupMembersFinder.new(project.group).execute.where.not(user_id: non_null_user_ids) + GroupMembersFinder.new(project.group).execute.where.not(user_id: non_null_user_ids).preload(:user) end # rubocop: enable CodeReuse/ActiveRecord end |