Merge branch 'master' into notes

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 8c8e60af7ce43126d36d208cda8814c7bcee7758..23eeceb19c1dd026a469045c5e86298c56aab07f 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
     arel (3.0.2)
     bigdecimal (1.1.0)
     builder (3.0.3)
-    cocaine (0.3.2)
+    cocaine (0.4.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -54,7 +54,7 @@ GEM
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)
-    httpclient (2.2.7)
+    httpclient (2.3.0.1)
     i18n (0.6.1)
     i18n-js (3.0.0.rc2)
       i18n
@@ -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.0.0)
+    minitest (4.1.0)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
@@ -92,7 +97,7 @@ GEM
       rack (~> 1.2)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
-    paperclip (2.7.1)
+    paperclip (2.8.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
@@ -129,8 +134,8 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redcarpet (2.1.1)
-    rinku (1.7.0)
+    redcarpet (2.2.1)
+    rinku (1.7.2)
     ruby-openid (2.2.1)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
@@ -148,7 +153,7 @@ GEM
     thor (0.16.0)
     tilt (1.3.3)
     timecop (0.5.2)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
@@ -174,6 +179,7 @@ DEPENDENCIES
   i18n-js (>= 3.0.0.rc2)
   iconv
   jquery-rails
+  jsonify-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   minitest