diff options
| -rw-r--r-- | app/serializers/pipeline_serializer.rb | 10 | ||||
| -rw-r--r-- | spec/serializers/pipeline_serializer_spec.rb | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index 7829df9fada..efeccebec41 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -13,7 +13,15 @@ class PipelineSerializer < BaseSerializer def represent(resource, opts = {}) if resource.is_a?(ActiveRecord::Relation) - resource = resource.includes(project: :namespace) + resource = resource.includes(:project) + resource = resource.includes(:pending_builds, + :retryable_builds, + :cancelable_statuses, + :manual_actions, + :artifacts) + resource = resource.includes(pending_builds: :project) + resource = resource.includes(manual_actions: :project) + resource = resource.includes(artifacts: :project) end if paginated? diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb index add43182cc2..54cb9babe45 100644 --- a/spec/serializers/pipeline_serializer_spec.rb +++ b/spec/serializers/pipeline_serializer_spec.rb @@ -105,7 +105,8 @@ describe PipelineSerializer do it "verifies number of queries" do recorded = ActiveRecord::QueryRecorder.new { subject } - expect(recorded.count).to be_within(200).of(10) + expect(recorded.count).to be_within(10).of(230) + expect(recorded.cached_count).to be_within(5).of(5) end def create_pipeline(status) |