use ruby-units for unit parsing (closes foodcoops/foodsoft#200)
Conflicts: Gemfile Gemfile.lock
This commit is contained in:
parent
48e9a3e4f5
commit
c25d4d3f4f
5 changed files with 48 additions and 23 deletions
1
Gemfile
1
Gemfile
|
|
@ -39,6 +39,7 @@ gem "rails-settings-cached", "0.3.1"
|
|||
gem 'resque'
|
||||
gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb
|
||||
gem 'protected_attributes'
|
||||
gem 'ruby-units'
|
||||
|
||||
# we use the git version of acts_as_versioned, and need to include it in this Gemfile
|
||||
gem 'acts_as_versioned', git: 'git://github.com/technoweenie/acts_as_versioned.git'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue