diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-18 06:09:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-18 06:09:31 +0000 |
commit | 0115b63f646be489bb9685dad0e4b0747a79de05 (patch) | |
tree | 1739ce6f3e7ab90db561e3415bd34427f4839b40 /app/helpers/search_helper.rb | |
parent | 37ea4b5fbf55e039a2255f0f5d5508e5f479775c (diff) | |
download | gitlab-ce-0115b63f646be489bb9685dad0e4b0747a79de05.tar.gz |
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, 15 insertions, 0 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 9f3623ad511..d55ad878b92 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -7,6 +7,7 @@ module SearchHelper return unless current_user resources_results = [ + recent_merge_requests_autocomplete(term), recent_issues_autocomplete(term), groups_autocomplete(term), projects_autocomplete(term) @@ -180,6 +181,20 @@ module SearchHelper end end + def recent_merge_requests_autocomplete(term, limit = 5) + return [] unless current_user + + ::Gitlab::Search::RecentMergeRequests.new(user: current_user).search(term).limit(limit).map do |mr| + { + category: "Recent merge requests", + id: mr.id, + label: search_result_sanitize(mr.title), + url: merge_request_path(mr), + avatar_url: mr.project.avatar_url || '' + } + end + end + def recent_issues_autocomplete(term, limit = 5) return [] unless current_user |