Merge 38e2d4c into dabd8b3

Author: rafaelsales

lib/active_admin/resource_controller/decorators.rb

@@ -67,7 +67,7 @@ def self.wrap(decorator)
         def self.wrap!(parent, name)
           ::Class.new parent do
             delegate :reorder, :page, :current_page, :total_pages, :limit_value,
-                     :total_count, :total_pages, :to_key, :group_values, :except,
+                     :total_count, :offset, :to_key, :group_values, :except,
                      :find_each, :ransack
 
             define_singleton_method(:name) { name }

lib/active_admin/views/components/paginated_collection.rb

@@ -96,7 +96,7 @@ def build_pagination
         options[:params]     = @params     if @params
         options[:param_name] = @param_name if @param_name
 
-        if !@display_total && collection.respond_to?(:offset)
+        if !@display_total
           # The #paginate method in kaminari will query the resource with a
           # count(*) to determine how many pages there should be unless
           # you pass in the :total_pages option. We issue a query to determine