Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 14 insertions, 7 deletions

diff --git a/lib/gitlab/search/recent_items.rb b/lib/gitlab/search/recent_items.rb
index 40d96ded275..593148025e1 100644
--- a/lib/gitlab/search/recent_items.rb
+++ b/lib/gitlab/search/recent_items.rb
@@ -6,9 +6,12 @@ module Gitlab
     # items. The #type and #finder methods are the only ones needed to be
     # implemented by classes inheriting from this.
     class RecentItems
-      ITEMS_LIMIT = 100
+      ITEMS_LIMIT = 100 # How much history to remember from the user
+      SEARCH_LIMIT = 5 # How many matching items to return from search
       EXPIRES_AFTER = 7.days
 
+      attr_reader :user
+
       def initialize(user:, items_limit: ITEMS_LIMIT, expires_after: EXPIRES_AFTER)
         @user = user
         @items_limit = items_limit
@@ -30,21 +33,25 @@ module Gitlab
       end
 
       def search(term)
-        ids = with_redis do |redis|
-          redis.zrevrange(key, 0, @items_limit - 1)
-        end.map(&:to_i)
-
-        finder.new(@user, search: term, in: 'title').execute.reorder(nil).id_in_ordered(ids) # rubocop: disable CodeReuse/ActiveRecord
+        finder.new(user, search: term, in: 'title')
+          .execute
+          .limit(SEARCH_LIMIT).reorder(nil).id_in_ordered(latest_ids) # rubocop: disable CodeReuse/ActiveRecord
       end
 
       private
 
+      def latest_ids
+        with_redis do |redis|
+          redis.zrevrange(key, 0, @items_limit - 1)
+        end.map(&:to_i)
+      end
+
       def with_redis(&blk)
         Gitlab::Redis::SharedState.with(&blk) # rubocop: disable CodeReuse/ActiveRecord
       end
 
       def key
-        "recent_items:#{type.name.downcase}:#{@user.id}"
+        "recent_items:#{type.name.downcase}:#{user.id}"
       end
 
       def type