2 files changed, 20 insertions, 4 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index 0957d1b6149..58f06b6708c 100644
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
@@ -30,7 +30,7 @@ module Gitlab
     end
 
     def users
-      super.where(id: @project.users)
+      super.where(id: @project.team.members) # rubocop:disable CodeReuse/ActiveRecord
     end
 
     def blobs_count
diff --git a/spec/lib/gitlab/project_search_results_spec.rb b/spec/lib/gitlab/project_search_results_spec.rb
index a5495184448..4a41d5cf51e 100644
--- a/spec/lib/gitlab/project_search_results_spec.rb
+++ b/spec/lib/gitlab/project_search_results_spec.rb
@@ -414,9 +414,9 @@ describe Gitlab::ProjectSearchResults do
   end
 
   describe 'user search' do
-    let(:project) { create(:project) }
+    it 'returns the user belonging to the project matching the search query' do
+      project = create(:project)
 
-    it 'returns the users belonging to the project matching the search query' do
       user1 = create(:user, username: 'gob_bluth')
       create(:project_member, :developer, user: user1, project: project)
 
@@ -425,7 +425,23 @@ describe Gitlab::ProjectSearchResults do
 
       create(:user, username: 'gob_2018')
 
-      expect(described_class.new(user, project, 'gob').objects('users')).to eq [user1]
+      result = described_class.new(user, project, 'gob').objects('users')
+
+      expect(result).to eq [user1]
+    end
+
+    it 'returns the user belonging to the group matching the search query' do
+      group = create(:group)
+      project = create(:project, namespace: group)
+
+      user1 = create(:user, username: 'gob_bluth')
+      create(:group_member, :developer, user: user1, group: group)
+
+      create(:user, username: 'gob_2018')
+
+      result = described_class.new(user, project, 'gob').objects('users')
+
+      expect(result).to eq [user1]
     end
   end
 end