Commit e0837df8 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Fix pipelines serializer with preloading pagination

parent 3f76a976
...@@ -3,10 +3,6 @@ class PipelineSerializer < BaseSerializer ...@@ -3,10 +3,6 @@ class PipelineSerializer < BaseSerializer
entity PipelineDetailsEntity entity PipelineDetailsEntity
def represent(resource, opts = {}) def represent(resource, opts = {})
if paginated? && !resource.respond_to?(:page)
raise Gitlab::Serializer::Pagination::InvalidResourceError
end
if resource.is_a?(ActiveRecord::Relation) if resource.is_a?(ActiveRecord::Relation)
resource = resource.preload([ resource = resource.preload([
:stages, :stages,
...@@ -22,6 +18,10 @@ class PipelineSerializer < BaseSerializer ...@@ -22,6 +18,10 @@ class PipelineSerializer < BaseSerializer
]) ])
end end
if paginated?
resource = paginator.paginate(resource)
end
if opts.delete(:preload) if opts.delete(:preload)
resource = Gitlab::Ci::Pipeline::Preloader.preload!(resource) resource = Gitlab::Ci::Pipeline::Preloader.preload!(resource)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment