From 26662acae99a15f2b98b3ccfad47481e0a2a66fa Mon Sep 17 00:00:00 2001
From: Didier Lafforgue <didier@nocoffee.fr>
Date: Mon, 16 Apr 2012 20:50:07 +0200
Subject: [PATCH] force version of the multi_json gem (1.2.0)

---
 Gemfile.lock           | 9 +++++----
 locomotive_cms.gemspec | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70960963..16d2720a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,6 +55,7 @@ PATH
       mimetype-fu (~> 0.1.2)
       mongo (~> 1.5.2)
       mongoid (~> 2.4.6)
+      multi_json (= 1.2.0)
       rack-cache (~> 1.1)
       rails (~> 3.2.3)
       rails-backbone (~> 0.6.1)
@@ -221,8 +222,8 @@ GEM
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.3.0)
-    multi_xml (0.4.3)
+    multi_json (1.2.0)
+    multi_xml (0.4.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.3.0)
@@ -290,11 +291,11 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.21.0)
+    selenium-webdriver (2.21.1)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
+      multi_json (< 1.3)
       rubyzip
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 0b6c828e..9202b52a 100755
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -59,6 +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 'httparty',                        '~> 0.8.1'
   s.add_dependency 'actionmailer-with-request',       '~> 0.3.0'