Remove changes in 'paginate' helper

b2fbeb37 · Tomasz Maczukin · 8d455503 · b2fbeb37
Commit b2fbeb37 authored Dec 28, 2015 by Tomasz Maczukin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

lib/api/helpers.rb lib/api/helpers.rb +2 -4

No files found.
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -97,10 +97,8 @@ module API
    end
    def paginate(relation)
-      page = (params[:page] || 1).to_i
+      per_page  = params[:per_page].to_i
-      per_page = (params[:per_page] || 30).to_i
+      paginated = relation.page(params[:page]).per(per_page)
-      paginated = relation.page(page).per(per_page)
      add_pagination_headers(paginated, per_page)
      paginated