diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 1b22907c10f..a7b789f848a 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -29,6 +29,7 @@ class SearchController < ApplicationController @search_objects = search_service.search_objects render_commits if @scope == 'commits' + eager_load_user_status if @scope == 'users' check_single_commit_result end @@ -54,6 +55,10 @@ class SearchController < ApplicationController @search_objects = prepare_commits_for_rendering(@search_objects) end + def eager_load_user_status + @search_objects = @search_objects.eager_load(:status) # rubocop:disable CodeReuse/ActiveRecord + end + def check_single_commit_result if @search_results.single_commit_result? only_commit = @search_results.objects('commits').first diff --git a/app/views/search/results/_user.html.haml b/app/views/search/results/_user.html.haml index fd454950ef0..8060a1577e4 100644 --- a/app/views/search/results/_user.html.haml +++ b/app/views/search/results/_user.html.haml @@ -4,5 +4,7 @@ = user_avatar(user: user, user_name: user.name, css_class: 'd-none d-sm-inline avatar s40') .user-info = link_to user_path(user), class: 'd-none d-sm-inline' do - .item-title= user.name + .item-title + = user.name + = user_status(user) .cgray= user.to_reference