From 4e546f502c6f8c96a5ef0e376b6af0d8c4ff8098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20St=C4=99pie=C5=84?= <jstepien@users.sourceforge.net>
Date: Tue, 12 Feb 2013 11:19:06 +0100
Subject: [PATCH] Update json to 1.7.7

Older versions of the json gem had vulnerabilities discussed at
https://groups.google.com/forum/#!topic/rubyonrails-security/4_YvCpLzL58/discussion
---
 Gemfile      | 2 ++
 Gemfile.lock | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 719cab69..52376bd1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,8 @@ gem 'bcrypt-ruby', '~> 2.1.4'
 gem 'htmlentities', '~> 4.3.0'
 gem "mail"
 
+gem "json", ">= 1.7.7"
+
 if RUBY_VERSION.to_f >= 1.9
 	gem "soap4r-ruby1.9"
 else
diff --git a/Gemfile.lock b/Gemfile.lock
index 37d5834d..fabe80e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
     htmlentities (4.3.1)
     httpclient (2.3.0.1)
     i18n (0.6.1)
-    json (1.7.5)
+    json (1.7.7)
     libwebsocket (0.1.7.1)
       addressable
       websocket