Add latest changes from gitlab-org/gitlab@master

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 b52f3411c49..611294ddfd8 100644
--- a/app/presenters/projects/import_export/project_export_presenter.rb
+++ b/app/presenters/projects/import_export/project_export_presenter.rb
@@ -31,11 +31,11 @@ module Projects
       def group_members
         return [] unless current_user.can?(:admin_group, project.group)
 
-        # We need `.where.not(user_id: nil)` here otherwise when a group has an
+        # We need `.connected_to_user` here otherwise when a group has an
         # invitee, it would make the following query return 0 rows since a NULL
         # user_id would be present in the subquery
         # See http://stackoverflow.com/questions/129077/not-in-clause-and-null-values
-        non_null_user_ids = project.project_members.where.not(user_id: nil).select(:user_id)
+        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)
       end
       # rubocop: enable CodeReuse/ActiveRecord