diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 18:08:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 18:08:56 +0300 |
commit | 61265b9f01c7db3d4f6e1266d165b1c85be7b9e7 (patch) | |
tree | b6589df984e18e3b008a155c8d9ffcae75cf7c91 /app/helpers/search_helper.rb | |
parent | 5460c19548d3d3d2ff764ceff05c2b72aa2d3a32 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/search_helper.rb')
-rw-r--r-- | app/helpers/search_helper.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 36b58be60fc..8d99d760613 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -7,8 +7,7 @@ module SearchHelper return unless current_user resources_results = [ - recent_merge_requests_autocomplete(term), - recent_issues_autocomplete(term), + recent_items_autocomplete(term), groups_autocomplete(term), projects_autocomplete(term) ].flatten @@ -27,6 +26,10 @@ module SearchHelper end end + def recent_items_autocomplete(term) + recent_merge_requests_autocomplete(term) + recent_issues_autocomplete(term) + end + def search_entries_info(collection, scope, term) return if collection.to_a.empty? @@ -186,10 +189,10 @@ module SearchHelper end end - def recent_merge_requests_autocomplete(term, limit = 5) + def recent_merge_requests_autocomplete(term) return [] unless current_user - ::Gitlab::Search::RecentMergeRequests.new(user: current_user).search(term).limit(limit).map do |mr| + ::Gitlab::Search::RecentMergeRequests.new(user: current_user).search(term).map do |mr| { category: "Recent merge requests", id: mr.id, @@ -200,10 +203,10 @@ module SearchHelper end end - def recent_issues_autocomplete(term, limit = 5) + def recent_issues_autocomplete(term) return [] unless current_user - ::Gitlab::Search::RecentIssues.new(user: current_user).search(term).limit(limit).map do |i| + ::Gitlab::Search::RecentIssues.new(user: current_user).search(term).map do |i| { category: "Recent issues", id: i.id, |