From 069e9c829708fb696218e1f3eb500f5cbaa0448c Mon Sep 17 00:00:00 2001
From: Daniel Weigh <daniel@jamkazam.com>
Date: Thu, 20 Feb 2014 00:18:11 -0500
Subject: [PATCH 1/2] VRFS-1135 allow empty string to be passed in to start
 parameter

(due to jQuery not stripping null / empty params and refactor)
---
 ruby/lib/jam_ruby/models/feed.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruby/lib/jam_ruby/models/feed.rb b/ruby/lib/jam_ruby/models/feed.rb
index 27ba46c68..f85912c58 100644
--- a/ruby/lib/jam_ruby/models/feed.rb
+++ b/ruby/lib/jam_ruby/models/feed.rb
@@ -20,7 +20,7 @@ module JamRuby
       sort ||= 'date'
       raise "not valid sort #{sort}" unless SORT_TYPES.include?(sort)
 
-      start = params[:start]
+      start = params[:start].presence
       if sort == 'date'
         start ||= FIXNUM_MAX
       else

From ca64966c7f2dcd2b5098539237290fe70caa0a66 Mon Sep 17 00:00:00 2001
From: Daniel Weigh <daniel@jamkazam.com>
Date: Thu, 20 Feb 2014 00:16:59 -0500
Subject: [PATCH 2/2] * duplicate entry

$ bundle exec rails server
Your Gemfile lists the gem bcrypt-ruby (= 3.0.1) more than once.
You should probably keep only one of them.
While it's not a problem now, it could cause errors if you change the
version of just one of them later.
---
 admin/Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/Gemfile b/admin/Gemfile
index 74f6a2125..5ec8a3411 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -37,7 +37,6 @@ gem 'bootstrap-will_paginate', '0.0.6'
 gem 'carrierwave', '0.9.0'
 gem 'carrierwave_direct'
 gem 'uuidtools', '2.1.2'
-gem 'bcrypt-ruby', '3.0.1'
 gem 'jquery-rails' # , '2.3.0' # pinned because jquery-ui-rails was split from jquery-rails, but activeadmin doesn't support this gem yet
 gem 'jquery-ui-rails'
 gem 'rails3-jquery-autocomplete'