Merge pull request #2607 from marutosi/finn/dev/reform

update reform
pull/2449/merge
Florian Kraft 10 years ago
commit e82fef25a1
  1. 2
      Gemfile
  2. 8
      Gemfile.lock

@ -187,7 +187,7 @@ end
# API gems
gem 'grape', '~> 0.10.1'
gem 'roar', '~> 1.0.0'
gem 'reform', '~> 1.2.4', require: false
gem 'reform', '~> 1.2.6', require: false
# Use the commented pure ruby gems, if you have not the needed prerequisites on
# board to compile the native ones. Note, that their use is discouraged, since

@ -344,12 +344,12 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.0.0)
reform (1.2.4)
reform (1.2.6)
activemodel
disposable (~> 0.0.5)
representable (~> 2.1.0)
uber (~> 0.0.11)
representable (2.1.3)
representable (2.1.5)
multi_json
nokogiri
uber (~> 0.0.7)
@ -431,7 +431,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.43)
uber (0.0.12)
uber (0.0.13)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@ -515,7 +515,7 @@ DEPENDENCIES
rails_autolink
rb-readline (~> 0.5.1)
rdoc (>= 2.4.2)
reform (~> 1.2.4)
reform (~> 1.2.6)
request_store
roar (~> 1.0.0)
rspec (~> 2.99.0)

Loading…
Cancel
Save