Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/gitlab/serializer/pagination.rb b/lib/gitlab/serializer/pagination.rb
index eb242cc7c20..bb7571dd66a 100644
--- a/lib/gitlab/serializer/pagination.rb
+++ b/lib/gitlab/serializer/pagination.rb
@@ -4,7 +4,6 @@ module Gitlab
   module Serializer
     class Pagination
       InvalidResourceError = Class.new(StandardError)
-      include ::API::Helpers::Pagination
 
       def initialize(request, response)
         @request = request
@@ -13,13 +12,13 @@ module Gitlab
 
       def paginate(resource)
         if resource.respond_to?(:page)
-          super(resource)
+          ::Gitlab::Pagination::OffsetPagination.new(self).paginate(resource)
         else
           raise InvalidResourceError
         end
       end
 
-      # Methods needed by `API::Helpers::Pagination`
+      # Methods needed by `Gitlab::Pagination::OffsetPagination`
       #
 
       attr_reader :request