Skip to content
Browse files

Merge pull request #88 from rescuedcode/ruby_p385_and_json_vulnerabil…

…ity_fix

JSON gem and ruby bumps
  • Loading branch information...
2 parents 7a1098c + b31b383 commit 37faaefd5aaf522ec2c2e203f6a9028e669f32f5 @fermion fermion committed Mar 11, 2013
Showing with 3 additions and 1 deletion.
  1. +1 −0 Gemfile
  2. +2 −1 Gemfile.lock
View
1 Gemfile
@@ -4,6 +4,7 @@ gem 'rails', '3.2.11'
gem 'backbone-support', '0.3.0'
gem 'bcrypt-ruby', '~> 3.0.1'
+gem 'json', '~> 1.7'
gem 'bitmask_attributes'
gem 'cancan'
gem 'coffee-filter'
View
3 Gemfile.lock
@@ -116,7 +116,7 @@ GEM
activesupport (>= 3.0.0)
blankslate (>= 2.1.2.4)
journey (1.0.4)
- json (1.7.6)
+ json (1.7.7)
launchy (2.1.2)
addressable (~> 2.3)
libwebsocket (0.1.5)
@@ -263,6 +263,7 @@ DEPENDENCIES
haml-rails
heroku
jbuilder
+ json (~> 1.7)
memcache-client
mobile-fu
mocha

0 comments on commit 37faaef

Please sign in to comment.
Something went wrong with that request. Please try again.