use ruby-units for unit parsing (closes foodcoops/foodsoft#200)

Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
wvengen 2013-12-06 18:14:32 +01:00
parent 48e9a3e4f5
commit c25d4d3f4f
5 changed files with 48 additions and 23 deletions

View file

@ -281,6 +281,7 @@ GEM
rspec-rerun (0.1.3)
rspec (>= 2.11.0)
ruby-prof (0.14.2)
ruby-units (1.4.4)
rubyzip (1.1.0)
sass (3.2.14)
sass-rails (4.0.1)
@ -421,6 +422,7 @@ DEPENDENCIES
rspec-rails
rspec-rerun
ruby-prof
ruby-units
sass-rails (~> 4.0.0)
select2-rails
selenium-webdriver