Merge branch 'master' into notes

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index ea355c4b39cc56d51eb2db0d6008af035ce74df4..8fea3da8e6f6d5b9265d9486dda3076946355a24 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)
@@ -178,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
@@ -189,7 +195,7 @@ DEPENDENCIES
   rack-cors
   rails (= 3.2.9)
   rails-i18n (>= 0.6.3)
-  redcarpet (>= 2.2.0)
+  redcarpet
   rinku (>= 1.2.2)
   ruby-openid (>= 2.2.0)
   sanitize