diff --git a/Gemfile.lock b/Gemfile.lock index 25fe8d8b18..24b261a1f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,7 @@ PATH actionpack (3.2.17) activemodel (= 3.2.17) activesupport (= 3.2.17) - builder (~> 3.0.0) + builder (~> 3.2) erubis (~> 2.7.0) journey (~> 1.0.4) rack (~> 1.4.5) @@ -24,7 +24,7 @@ PATH sprockets (~> 2.2.1) activemodel (3.2.17) activesupport (= 3.2.17) - builder (~> 3.0.0) + builder (~> 3.2) activerecord (3.2.17) activemodel (= 3.2.17) activesupport (= 3.2.17) @@ -59,7 +59,7 @@ GEM arel (3.0.3) bcrypt-ruby (3.0.1) benchmark-ips (1.2.0) - builder (3.0.4) + builder (3.2.2) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index cd906c0cdc..d0b50791e9 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('activemodel', version) s.add_dependency('rack-cache', '~> 1.2') - s.add_dependency('builder', '~> 3.0.0') + s.add_dependency('builder', '~> 3.2') s.add_dependency('rack', '~> 1.4.5') s.add_dependency('rack-test', '~> 0.6.1') s.add_dependency('journey', '~> 1.0.4') diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index a4f0836282..ee3e5d31d5 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -19,5 +19,5 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.add_dependency('activesupport', version) - s.add_dependency('builder', '~> 3.0.0') + s.add_dependency('builder', '~> 3.2') end diff --git a/vendor/cache/builder-3.0.4.gem b/vendor/cache/builder-3.0.4.gem deleted file mode 100644 index 15c6ee23fb..0000000000 Binary files a/vendor/cache/builder-3.0.4.gem and /dev/null differ diff --git a/vendor/cache/builder-3.2.2.gem b/vendor/cache/builder-3.2.2.gem new file mode 100644 index 0000000000..b59ef922eb Binary files /dev/null and b/vendor/cache/builder-3.2.2.gem differ