Fix pipelines serializer with preloading pagination

This commit is contained in:
Grzegorz Bizon 2018-05-25 11:31:18 +02:00
parent f0d7445b88
commit 0e1b3dc41b
1 changed files with 4 additions and 4 deletions

View File

@ -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