1 files changed, 5 insertions, 4 deletions
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index 7c8dfad3b4b..245298db3c3 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -4,7 +4,7 @@ class PipelineSerializer < BaseSerializer
   entity PipelineEntity
 
   def with_pagination(request, response)
-    tap { @paginator = Paginator.new(request, response) }
+    tap { @paginator = Gitlab::Serializer::Pagination.new(request, response) }
   end
 
   def paginated?
@@ -12,10 +12,11 @@ class PipelineSerializer < BaseSerializer
   end
 
   def represent(resource, opts = {})
-    if paginated?
-      raise InvalidResourceError unless resource.respond_to?(:page)
-
+    if resource.is_a?(ActiveRecord::Relation)
       resource = resource.includes(project: :namespace)
+    end
+
+    if paginated?
       super(@paginator.paginate(resource), opts)
     else
       super(resource, opts)