diff --git a/.ruby-version b/.ruby-version index ebf14b469..530cdd91a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.8 +2.2.4 diff --git a/.travis.yml b/.travis.yml index 42fb140d5..9a3401865 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: global: secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4=" 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 c4f090a8a..f1a524b0c 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' diff --git a/app/views/harvests/_form.html.haml b/app/views/harvests/_form.html.haml index 67dbda1e0..34946cad1 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