diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index d4b85f5aeb4..17a022539bb 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -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