From c258b26860bedef7369b3b2ce6402bd74d8c197e Mon Sep 17 00:00:00 2001
From: Roland Jesse <roland.jesse@pta.de>
Date: Mon, 23 Apr 2012 23:02:14 +0200
Subject: [PATCH] Fix version of 'json' gem to the one we have at production
 site.

---
 Gemfile      | 3 +++
 Gemfile.lock | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 29fadd8..a2efa44 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,9 @@ gem 'capistrano', '2.5.21'
 # https://github.com/jnunemaker/twitter
 gem 'twitter', '1.6.0'
 
+# Specify this directly in order to use version we also have @production site. Otherwise, 'rdoc' pulls newest version in.
+gem 'json', '1.6.5'
+
 # We are sending mail. The latest version is just fine.
 gem 'mail'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7fb3463..7cc80c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -88,7 +88,7 @@ GEM
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.6)
+    json (1.6.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -184,6 +184,7 @@ DEPENDENCIES
   capistrano (= 2.5.21)
   coffee-rails (= 3.2.2)
   devise (= 2.0.4)
+  json (= 1.6.5)
   mail
   mysql2 (= 0.3.11)
   rails (= 3.2.3)