Improve performance of Pipelines API

3 files changed, 8 insertions, 5 deletions

diff --git a/app/finders/pipelines_finder.rb b/app/finders/pipelines_finder.rb
index 32aea75486d..af4bb54e52d 100644
--- a/app/finders/pipelines_finder.rb
+++ b/app/finders/pipelines_finder.rb
@@ -20,6 +20,7 @@ class PipelinesFinder
       end
 
     scoped_pipelines.order(id: :desc)
+      .includes(project: [:namespace])
   end
 
   private
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 54f73171fd4..9efda36fc0c 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -124,7 +124,7 @@ module Ci
     end
 
     def artifacts
-      builds.latest.with_artifacts_not_expired
+      builds.latest.with_artifacts_not_expired.includes(project: [:namespace])
     end
 
     def project_id
@@ -173,7 +173,11 @@ module Ci
     end
 
     def manual_actions
-      builds.latest.manual_actions
+      builds.latest.manual_actions.includes(project: [:namespace])
+    end
+
+    def stuck?
+      builds.pending.any?(&:stuck?)
     end
 
     def retryable?
diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb
index 613a18e6357..3ede0fb0f53 100644
--- a/app/serializers/pipeline_entity.rb
+++ b/app/serializers/pipeline_entity.rb
@@ -33,9 +33,7 @@ class PipelineEntity < Grape::Entity
       pipeline.yaml_errors.present?
     end
 
-    expose :stuck?, as: :stuck do |pipeline|
-      pipeline.builds.any?(&:stuck?)
-    end
+    expose :stuck?, as: :stuck
   end
 
   expose :ref do