Merge branch 'master' into notes

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 83ea2ef4821a6d12b80c417e2aaf0799fc564147..eafd5d341a16a4ba61ad384214e5ce40c3cc6f78 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,6 +64,11 @@ GEM
       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)
@@ -74,7 +79,7 @@ GEM
       treetop (~> 1.4.8)
     memcached (1.4.6)
     mime-types (1.19)
-    minitest (4.2.0)
+    minitest (4.3.0)
     multi_json (1.3.7)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
@@ -99,6 +104,7 @@ GEM
       mime-types
     pg (0.14.1)
     polyglot (0.3.3)
+    r2 (0.0.3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -128,7 +134,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.0)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.2.2)
@@ -177,6 +183,7 @@ DEPENDENCIES
   i18n-js (>= 3.0.0.rc2)
   iconv
   jquery-rails
+  jsonify-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   minitest
@@ -184,6 +191,7 @@ DEPENDENCIES
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg
+  r2
   rack-cors
   rails (= 3.2.9)
   rails-i18n (>= 0.6.3)