diff --git a/Gemfile b/Gemfile index 32bf0af..6805ec9 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'rpx_now', '~> 0.6.23' gem 'timeline_fu', '~> 0.3.0' gem 'treetop-dcf', '~> 0.2.1' gem 'will_paginate', '~> 2.3.15' -gem 'yajl-ruby', '~> 0.7.8', :require => 'yajl' +gem 'yajl-ruby', '~> 1.4.2', :require => 'yajl' group :development, :test do gem 'rspec-rails', '~> 1.3.4' diff --git a/Gemfile.lock b/Gemfile.lock index d72efec..21858d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,7 +126,7 @@ GEM rack-test (>= 0.5.3) will_paginate (2.3.15) wirble (0.1.3) - yajl-ruby (0.7.9) + yajl-ruby (1.4.2) PLATFORMS ruby @@ -164,4 +164,4 @@ DEPENDENCIES webrat (~> 0.7.2) will_paginate (~> 2.3.15) wirble - yajl-ruby (~> 0.7.8) + yajl-ruby (~> 1.4.2)