From 6905cd410ddf821763945adf703c26d688ee962e Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Mon, 28 Mar 2016 23:38:25 +1030
Subject: [PATCH 1/3] Bump to current ruby 2.2.*, as there's an end of life for
 2.1.*
 https://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/

---
 .travis.yml | 2 +-
 Gemfile     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 52c876cc6..52e7662f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
     secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
 bundler_args: "--without development production staging"
 rvm:
-- 2.1.8
+- 2.2.4
 before_script:
 - psql -c 'create database growstuff_test;' -U postgres
 script:
diff --git a/Gemfile b/Gemfile
index 965d84579..2de2fefca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.1.8'
+ruby '2.2.4'
 
 gem 'rails', '4.1.11'
 

From b0adec20e73b03b18ca348965bc0765df17bc2c2 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Mon, 28 Mar 2016 23:40:17 +1030
Subject: [PATCH 2/3] Fix CVE-2015-7551
 (https://www.ruby-lang.org/en/news/2015/12/16/unsafe-tainted-string-usage-in-fiddle-and-dl-cve-2015-7551/)

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 04b10b4f1..530cdd91a 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.7
+2.2.4

From 668f6d3a2b99de386bbe00e91a07b052dd594650 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Tue, 29 Mar 2016 00:43:14 +1030
Subject: [PATCH 3/3] Fix 'app/views/harvests/_form.html.haml:39: warning:
 duplicated key at line 39 ignored: :class'

---
 app/views/harvests/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/harvests/_form.html.haml b/app/views/harvests/_form.html.haml
index 0b61ae03e..5908b829e 100644
--- a/app/views/harvests/_form.html.haml
+++ b/app/views/harvests/_form.html.haml
@@ -36,7 +36,7 @@
   .form-group
     = f.label :weight_quantity, 'Weighing (in total):', :class => 'control-label col-md-2'
     .col-md-2
-      = f.number_field :weight_quantity, :class => 'input-small', :step => 'any', :class => 'form-control', :placeholder => 'optional'
+      = f.number_field :weight_quantity, :class => 'input-small form-control', :step => 'any', :placeholder => 'optional'
     .col-md-2
       = f.select(:weight_unit, Harvest::WEIGHT_UNITS_VALUES, {:include_blank => false}, :class => 'form-control')
   .form-group