mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-02-05 23:21:07 -05:00
Merge pull request #884 from pozorvlak/bump_ruby_22x
Bump ruby to 2.2.x
This commit is contained in:
@@ -1 +1 @@
|
||||
2.1.8
|
||||
2.2.4
|
||||
|
||||
@@ -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:
|
||||
|
||||
2
Gemfile
2
Gemfile
@@ -1,6 +1,6 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
ruby '2.1.8'
|
||||
ruby '2.2.4'
|
||||
|
||||
gem 'rails', '~> 4.1.11'
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user