Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/app/finders/autocomplete/users_finder.rb b/app/finders/autocomplete/users_finder.rb
index 8dc3c2320ed..ff5d9ea7d19 100644
--- a/app/finders/autocomplete/users_finder.rb
+++ b/app/finders/autocomplete/users_finder.rb
@@ -38,7 +38,9 @@ module Autocomplete
         end
       end
 
-      items.uniq
+      items.uniq.tap do |unique_items|
+        preload_associations(unique_items)
+      end
     end
 
     private
@@ -91,6 +93,12 @@ module Autocomplete
         User.none
       end
     end
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def preload_associations(items)
+      ActiveRecord::Associations::Preloader.new.preload(items, :status)
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
   end
 end