Merge branch 'master' into openstreetbugs

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 74f6009b671349105da6cbb870d9fe725748e75f..65de156e17b6a1d3b327663079f55faa44f63c0a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.1'
+gem 'rails', '3.2.2'
 
 # Require the postgres database driver
 gem 'pg'
@@ -21,6 +21,7 @@ gem 'composite_primary_keys', '>= 5.0.0'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
+gem 'jsonify-rails'
 
 # Character conversion support for ruby 1.8
 gem 'iconv', :platforms => :ruby_18