Merge branch 'master' into openstreetbugs

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 6f2e73d431adfcadd9b4255749c9068492fd1c63..158694564993cb1f7b9232757d8171d60d33f6fc 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,10 +58,15 @@ GEM
     i18n (0.6.0)
     iconv (0.1)
     journey (1.0.4)
-    jquery-rails (2.1.0)
+    jquery-rails (2.1.1)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
+    jsonify (0.3.1)
+      multi_json (~> 1.0)
+    jsonify-rails (0.3.2)
+      actionpack
+      jsonify (< 0.4.0)
     jwt (0.1.5)
       multi_json (>= 1.0)
     libv8 (3.3.10.4)
@@ -171,6 +176,7 @@ DEPENDENCIES
   httpclient
   iconv
   jquery-rails
+  jsonify-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   minitest