From e99793a4c8db7fe7f54d3984b0f617fc083de5f6 Mon Sep 17 00:00:00 2001
From: David Arango <arango@gmail.com>
Date: Tue, 12 Feb 2013 00:01:05 +0100
Subject: [PATCH] Locks rack version and updates json version

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

diff --git a/Gemfile b/Gemfile
index 823db8645d..8518d8c15d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -81,6 +81,7 @@ group :development, :test do
   gem "capybara",              "1.1.2"
   gem "timecop",               "0.3.5"
   gem "email_spec",            "1.2.1"
+  gem "rack",                  "1.4.1"
   gem "rack-reverse-proxy",    "0.4.4", :require => 'rack/reverse_proxy'
   gem "rack-test"
   gem "foreman",               "0.46.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index a7443e577d..4e8c359807 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,7 +119,7 @@ GEM
     httpauth (0.2.0)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.6)
+    json (1.7.7)
     jwt (0.1.5)
       multi_json (>= 1.0)
     launchy (2.1.0)
@@ -135,7 +135,7 @@ GEM
     minitest (2.0.2)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
+    multi_json (1.5.1)
     multi_xml (0.5.3)
     multipart-post (1.1.5)
     mustache (0.99.4)
@@ -161,7 +161,7 @@ GEM
       http_parser.rb (~> 0.5.3)
       multi_json (~> 1.0)
     polyglot (0.3.3)
-    rack (1.4.5)
+    rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-protection (1.3.2)
@@ -325,6 +325,7 @@ DEPENDENCIES
   oily_png (~> 1.0.2)
   pg (= 0.11)
   poltergeist (>= 1.0.0)
+  rack (= 1.4.1)
   rack-reverse-proxy (= 0.4.4)
   rails (= 3.2.2)
   rails_warden (= 0.5.2)