Handle pagination error manually

1 files changed, 7 insertions, 5 deletions

diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index 4aa518d731f..4cbb58fb4f0 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -17,13 +17,15 @@ class PipelineSerializer < BaseSerializer
         :user,
         statuses: { project: [:project_feature, :namespace] },
         project: :namespace)
-    end
 
-    if paginated?
-      resource = @paginator.paginate(resource)
-    end
+      if paginated?
+        resource = @paginator.paginate(resource)
+      end
 
-    preload_commit_authors(resource) if resource
+      preload_commit_authors(resource)
+    elsif paginated?
+      raise Gitlab::Serializer::Pagination::InvalidResourceError
+    end
 
     super(resource, opts)
   end