Merge pull request #148 from jstepien/fix-json-vulnerability

Update json to 1.7.7
This commit is contained in:
Reinier Balt 2013-02-12 13:49:08 -08:00
commit 7f1f2a01f6
2 changed files with 3 additions and 1 deletions

View file

@ -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

View file

@ -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