Merge branch 'master' into openstreetbugs

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index e04a0810a6c5f1a008050c275ddfcaed0f991fb0..25b10fe7b09c3895944fae03c49849846bc8bc0d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.7'
+gem 'rails', '3.2.8'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', :platforms => :ruby_19
@@ -24,6 +24,7 @@ gem 'composite_primary_keys', '>= 5.0.8'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
+gem 'jsonify-rails'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'