diff --git a/Gemfile b/Gemfile index ab1dd82d8..c2b780660 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem 'trinidad', '~> 1.0.2', :platforms => :jruby gem 'newrelic_rpm', '~> 3.4.1', :platforms => [:mri, :rbx] gem 'whenever', '~> 0.7.3', :require => false -gem 'jbuilder', '~> 0.4.0' +gem 'jbuilder', '~> 0.8.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 0d8a21405..7b2cee398 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -145,9 +145,8 @@ GEM hike (1.2.1) hirb (0.7.0) i18n (0.6.0) - jbuilder (0.4.3) + jbuilder (0.8.2) activesupport (>= 3.0.0) - blankslate (>= 2.1.2.4) journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) @@ -381,7 +380,7 @@ DEPENDENCIES haml-rails (~> 0.3.4) highline (~> 1.6.11) hirb - jbuilder (~> 0.4.0) + jbuilder (~> 0.8.2) jquery-rails (~> 2.0.2) mailcatcher meta-tags (~> 1.2.5)