From ef78471b5953075a70e795a8d3fbbc347de76639 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Fri, 20 Mar 2015 21:27:11 -0500
Subject: [PATCH] Merge cherry pick

---
 ruby/lib/jam_ruby/models/jam_track.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb
index 2ce156226..da38c2fe3 100644
--- a/ruby/lib/jam_ruby/models/jam_track.rb
+++ b/ruby/lib/jam_ruby/models/jam_track.rb
@@ -81,16 +81,9 @@ module JamRuby
           page = options[:page].to_i
           per_page = options[:per_page].to_i
 
-          if per_page == 0
-            # try and see if limit was specified
-            limit = options[:limit]
-            limit ||= 20
-            limit = limit.to_i
-          else
-            limit = per_page
-          end
 
           start = (page -1 )* per_page
+          limit = per_page
         else
           limit = options[:limit]
           limit ||= 20