Merge branch 'master' into openstreetbugs

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 4709cd1957672fdf359c91764acaeadc7f8b2456..e212d100374d22d9a3c1c61dc04ded678984ccda 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,9 +61,14 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.6.5)
+    jsonify (0.3.1)
+      multi_json (~> 1.0)
+    jsonify-rails (0.3.1)
+      actionpack
+      jsonify (>= 0.3.1)
     libv8 (3.3.10.4)
     libxml-ruby (2.2.2)
-    mail (2.4.1)
+    mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -91,7 +96,7 @@ GEM
     pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -141,7 +146,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
     uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -160,6 +165,7 @@ DEPENDENCIES
   httpclient
   iconv
   jquery-rails
+  jsonify-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   oauth-plugin (>= 0.4.0.pre7)