diff --git a/Gemfile b/Gemfile index 68ee169bd..04cf7e543 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem 'trinidad', '~> 1.0.2', :platforms => :jruby gem 'newrelic_rpm', '~> 3.5.5.38', :platforms => [:mri, :rbx] gem 'whenever', '~> 0.7.3', :require => false -gem 'jbuilder', '~> 0.8.2' +gem 'jbuilder', '~> 1.4.2' gem 'rails3-jquery-autocomplete', '~> 1.0.7' gem 'will_paginate', '~> 3.0.3' gem 'meta-tags', '~> 1.2.5', :require => 'meta_tags' diff --git a/Gemfile.lock b/Gemfile.lock index f6f5b6836..5d3c8cc22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,8 +162,9 @@ GEM hirb (0.7.1) httpauth (0.2.0) i18n (0.6.1) - jbuilder (0.8.3) + jbuilder (1.4.2) activesupport (>= 3.0.0) + multi_json (>= 1.2.0) journey (1.0.4) jquery-rails (2.0.3) railties (>= 3.1.0, < 5.0) @@ -446,7 +447,7 @@ DEPENDENCIES haml-rails (~> 0.3.4) highline (~> 1.6.11) hirb - jbuilder (~> 0.8.2) + jbuilder (~> 1.4.2) jquery-rails (~> 2.0.2) mailcatcher meta-tags (~> 1.2.5)