From 227a664e5e7e6c9c986b4a34ded84fa74af64001 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 6 Apr 2017 15:35:40 +0200
Subject: Next round

---
 app/serializers/pipeline_serializer.rb | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'app/serializers/pipeline_serializer.rb')

diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index 08a664ad4bf..0af9ef0e3f7 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -13,18 +13,15 @@ class PipelineSerializer < BaseSerializer
 
   def represent(resource, opts = {})
     if resource.is_a?(ActiveRecord::Relation)
-      project_includes = [ { namespace: :route }, :route ]
-      resource = resource.includes(
+      resource = resource.includes([
         :retryable_builds,
         :cancelable_statuses,
-        :trigger_requests
-      )
-      resource = resource.includes(
-        project: project_includes,
-        pending_builds: [:project],
-        manual_actions: { project: project_includes },
-        artifacts: { project: project_includes }
-      )
+        :trigger_requests,
+        :project,
+        { pending_builds: :project },
+        { manual_actions: :project },
+        { artifacts: :project }
+      ])
     end
 
     if paginated?
-- 
cgit v1.2.1