Automatic merge of gitlab-org/gitlab-ce master

app/helpers/projects_helper.rb

@@ -171,7 +171,7 @@ module ProjectsHelper
     translation.html_safe
   end
 
-  def project_list_cache_key(project)
+  def project_list_cache_key(project, pipeline_status: true)
     key = [
       project.route.cache_key,
       project.cache_key,
@@ -181,10 +181,11 @@ module ProjectsHelper
       Gitlab::CurrentSettings.cache_key,
       "cross-project:#{can?(current_user, :read_cross_project)}",
       max_project_member_access_cache_key(project),
+      pipeline_status,
       'v2.6'
     ]
 
-    key << pipeline_status_cache_key(project.pipeline_status) if project.pipeline_status.has_status?
+    key << pipeline_status_cache_key(project.pipeline_status) if pipeline_status && project.pipeline_status.has_status?
 
     key
   end

app/views/search/_results.html.haml

@@ -21,7 +21,7 @@
       .search-results
         - if @scope == 'projects'
           .term
-            = render 'shared/projects/list', projects: @search_objects
+            = render 'shared/projects/list', projects: @search_objects, pipeline_status: false
         - else
           = render partial: "search/results/#{@scope.singularize}", collection: @search_objects
 

app/views/shared/projects/_project.html.haml

@@ -10,7 +10,7 @@
 - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && can_show_last_commit_in_list?(project)
 - css_class = '' unless local_assigns[:css_class]
 - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description
-- cache_key = project_list_cache_key(project)
+- cache_key = project_list_cache_key(project, pipeline_status: pipeline_status)
 - updated_tooltip = time_ago_with_tooltip(project.last_activity_date)
 - css_controls_class = compact_mode ? "" : "flex-lg-row justify-content-lg-between"
 - avatar_container_class = project.creator && use_creator_avatar ? '' : 'rect-avatar'

changelogs/unreleased/avoid_es_loading_project_ci_status.yml

+---
+title: Avoid loading pipeline status in project search
+merge_request: 26342
+author:
+type: performance