Fix pipelines serializer with preloading pagination
This commit is contained in:
parent
f0d7445b88
commit
0e1b3dc41b
|
@ -3,10 +3,6 @@ class PipelineSerializer < BaseSerializer
|
|||
entity PipelineDetailsEntity
|
||||
|
||||
def represent(resource, opts = {})
|
||||
if paginated? && !resource.respond_to?(:page)
|
||||
raise Gitlab::Serializer::Pagination::InvalidResourceError
|
||||
end
|
||||
|
||||
if resource.is_a?(ActiveRecord::Relation)
|
||||
resource = resource.preload([
|
||||
:stages,
|
||||
|
@ -20,6 +16,10 @@ class PipelineSerializer < BaseSerializer
|
|||
])
|
||||
end
|
||||
|
||||
if paginated?
|
||||
resource = paginator.paginate(resource)
|
||||
end
|
||||
|
||||
if opts.delete(:preload)
|
||||
resource = Gitlab::Ci::Pipeline::Preloader.preload!(resource)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue