Update tests and associations

2 files changed, 12 insertions, 4 deletions

diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index efeccebec41..d9dbd5608d6 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -13,15 +13,16 @@ class PipelineSerializer < BaseSerializer
 
   def represent(resource, opts = {})
     if resource.is_a?(ActiveRecord::Relation)
-      resource = resource.includes(:project)
       resource = resource.includes(:pending_builds,
         :retryable_builds,
         :cancelable_statuses,
         :manual_actions,
-        :artifacts)
+        :artifacts,
+        :trigger_requests)
       resource = resource.includes(pending_builds: :project)
-      resource = resource.includes(manual_actions: :project)
-      resource = resource.includes(artifacts: :project)
+      resource = resource.includes(project: :namespace)
+      resource = resource.includes(manual_actions: { project: :namespace })
+      resource = resource.includes(artifacts: { project: :namespace })
     end
 
     if paginated?
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 54cb9babe45..997f40662c5 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -101,6 +101,13 @@ describe PipelineSerializer do
         Ci::Pipeline::AVAILABLE_STATUSES.each do |status|
           create_pipeline(status)
         end
+
+        RequestStore.begin!
+      end
+
+      after do
+        RequestStore.end!
+        RequestStore.clear!
       end
 
       it "verifies number of queries" do