Merge branch 'master' into notes

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index a53bc3d0d49edd889d7e9153f8c5bd8ad91d380c..7679a6ccba333de324c9563523071445aa779a90 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,7 +51,7 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)

-    faraday (0.8.6)
+    faraday (0.8.7)

       multipart-post (~> 1.1)
     hike (1.2.1)
     htmlentities (4.3.1)
       multipart-post (~> 1.1)
     hike (1.2.1)
     htmlentities (4.3.1)


@@ -67,6 +67,11 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.7)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.7)

+    jsonify (0.3.1)
+      multi_json (~> 1.0)
+    jsonify-rails (0.3.2)
+      actionpack
+      jsonify (< 0.4.0)

     jwt (0.1.8)
       multi_json (>= 1.5)
     libv8 (3.3.10.4)
     jwt (0.1.8)
       multi_json (>= 1.5)
     libv8 (3.3.10.4)


@@ -102,7 +107,7 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types

-    pg (0.14.1)
+    pg (0.15.0)

     polyglot (0.3.3)
     r2 (0.1.0)
     rack (1.4.5)
     polyglot (0.3.3)
     r2 (0.1.0)
     rack (1.4.5)


@@ -134,7 +139,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)

-    rake (10.0.3)
+    rake (10.0.4)

     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.2.2)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.2.2)


@@ -154,7 +159,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)

-    thor (0.17.0)
+    thor (0.18.0)

     tilt (1.3.6)
     timecop (0.6.1)
     treetop (1.4.12)
     tilt (1.3.6)
     timecop (0.6.1)
     treetop (1.4.12)


@@ -183,6 +188,7 @@ DEPENDENCIES
   i18n-js (>= 3.0.0.rc2)
   iconv (= 0.1)
   jquery-rails
   i18n-js (>= 3.0.0.rc2)
   iconv (= 0.1)
   jquery-rails

+  jsonify-rails

   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   minitest
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   minitest