From f42fb1afe1fe95cbd8670e9334247a32cc2385e0 Mon Sep 17 00:00:00 2001
From: Didier Lafforgue <didier@nocoffee.fr>
Date: Sat, 5 May 2012 11:17:18 +0200
Subject: [PATCH] finally the new version of the multi_json gem (issue #387)

---
 Gemfile.lock           | 26 +++++++++++++-------------
 locomotive_cms.gemspec |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 75a976bc..5c90f438 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ PATH
       mimetype-fu (~> 0.1.2)
       mongo (~> 1.5.2)
       mongoid (~> 2.4.9)
-      multi_json (= 1.2.0)
+      multi_json (~> 1.3.4)
       rack-cache (~> 1.1)
       rails (~> 3.2.3)
       rails-backbone (~> 0.6.1)
@@ -88,7 +88,7 @@ GEM
     activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.7)
+    addressable (2.2.8)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
     bson (1.5.2)
@@ -112,7 +112,7 @@ GEM
     cells (3.8.3)
       actionpack (~> 3.0)
       railties (~> 3.0)
-    childprocess (0.3.1)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     chunky_png (1.2.5)
     codemirror-rails (2.24)
@@ -149,7 +149,7 @@ GEM
     ejs (1.0.0)
     erubis (2.7.0)
     excon (0.13.4)
-    execjs (1.3.0)
+    execjs (1.3.1)
       multi_json (~> 1.0)
     factory_girl (2.5.2)
       activesupport (>= 2.3.9)
@@ -186,8 +186,8 @@ GEM
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.6.6)
-    json_spec (1.0.0)
+    json (1.7.0)
+    json_spec (1.0.3)
       multi_json (~> 1.0)
       rspec (~> 2.0)
     kaminari (0.13.0)
@@ -219,7 +219,7 @@ GEM
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.2.0)
+    multi_json (1.3.4)
     multi_xml (0.4.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
@@ -280,23 +280,23 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.8.0)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.7)
+    rubyzip (0.9.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.15)
+    sass (3.1.17)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.21.1)
+    selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
-      multi_json (< 1.3)
+      multi_json (~> 1.0)
       rubyzip
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -310,7 +310,7 @@ GEM
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    unicorn (4.2.1)
+    unicorn (4.3.1)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 8f58273b..0f465c96 100755
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack-cache',                      '~> 1.1'
   s.add_dependency 'mimetype-fu',                     '~> 0.1.2'
 
-  s.add_dependency 'multi_json',                      '1.2.0'
+  s.add_dependency 'multi_json',                      '~> 1.3.4'
   s.add_dependency 'httparty',                        '~> 0.8.1'
   s.add_dependency 'actionmailer-with-request',       '~> 0.3.0'