Skip to content
This repository has been archived by the owner on Oct 12, 2018. It is now read-only.

Commit

Permalink
Merge pull request #325 from alphagov/update-gems-security-audit
Browse files Browse the repository at this point in the history
Updates several vulnerable gems
  • Loading branch information
tijmenb committed Feb 5, 2016
2 parents c213aef + 0038dbf commit 03a42c1
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
10 changes: 5 additions & 5 deletions Gemfile
Expand Up @@ -33,9 +33,9 @@ gem 'logstasher', '0.4.8'
# TODO: Investigate whether there is a requirement to pin these
# gems here, when they are dependencies of govuk_content_models
gem "mongoid", "~> 2.5"
gem "mongo", "1.7.1"
gem "bson_ext", "1.7.1"
gem "bson", "1.7.1"
gem "mongo", "~> 1.12.3"
gem "bson_ext", "~> 1.12.3"
gem "bson", "~> 1.12.3"

if ENV['CONTENT_MODELS_DEV']
gem "govuk_content_models", path: '../govuk_content_models'
Expand All @@ -62,7 +62,7 @@ gem 'config', '~>1.0'
group :assets do
gem "therubyracer", "0.12.0"
gem 'sass-rails', '3.2.6'
gem 'uglifier'
gem 'uglifier', '>= 2.7.2'
end

group :development do
Expand Down Expand Up @@ -92,5 +92,5 @@ group :test do
end

group :import do
gem 'nokogiri'
gem 'nokogiri', '>= 1.6.7.2'
end
34 changes: 18 additions & 16 deletions Gemfile.lock
Expand Up @@ -45,9 +45,9 @@ GEM
bootstrap-sass (3.3.5.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.3.0)
bson (1.7.1)
bson_ext (1.7.1)
bson (~> 1.7.1)
bson (1.12.5)
bson_ext (1.12.5)
bson (~> 1.12.5)
builder (3.0.4)
bunny (2.2.1)
amq-protocol (>= 2.0.0)
Expand Down Expand Up @@ -98,7 +98,8 @@ GEM
config (1.0.0)
activesupport (>= 3.0)
deep_merge (~> 1.0.0)
crack (0.3.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
Expand Down Expand Up @@ -213,12 +214,12 @@ GEM
metaclass (0.0.1)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.2)
mini_portile2 (2.0.0)
minitest (3.3.0)
mocha (0.13.3)
metaclass (~> 0.0.1)
mongo (1.7.1)
bson (~> 1.7.1)
mongo (1.12.5)
bson (= 1.12.5)
mongoid (2.6.0)
activemodel (~> 3.1)
mongo (~> 1.7)
Expand All @@ -235,8 +236,8 @@ GEM
net-http-digest_auth (1.4)
net-http-persistent (2.9.4)
netrc (0.11.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
ntlm-http (0.1.1)
null_logger (0.0.1)
oauth2 (1.0.0)
Expand Down Expand Up @@ -307,6 +308,7 @@ GEM
multi_json
null_logger
rest-client
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sass (3.4.18)
Expand Down Expand Up @@ -341,9 +343,9 @@ GEM
turn (0.9.6)
ansi
tzinfo (0.3.46)
uglifier (1.2.7)
uglifier (2.7.2)
execjs (>= 0.3.0)
multi_json (~> 1.3)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
Expand Down Expand Up @@ -375,8 +377,8 @@ DEPENDENCIES
airbrake (= 3.1.15)
ansi
bootstrap-kaminari-views (= 0.0.3)
bson (= 1.7.1)
bson_ext (= 1.7.1)
bson (~> 1.12.3)
bson_ext (~> 1.12.3)
capybara (~> 2.1.0)
capybara-mechanize (~> 1.1.0)
chosen-rails (= 1.4.2)
Expand All @@ -403,11 +405,11 @@ DEPENDENCIES
mechanize (~> 2.7.2)
minitest
mocha (= 0.13.3)
mongo (= 1.7.1)
mongo (~> 1.12.3)
mongoid (~> 2.5)
mongoid_rails_migrations (= 1.0.0)
nested_form (= 0.3.2)
nokogiri
nokogiri (>= 1.6.7.2)
null_logger
plek (~> 1.8)
poltergeist (~> 1.6.0)
Expand All @@ -422,7 +424,7 @@ DEPENDENCIES
simplecov-rcov
therubyracer (= 0.12.0)
turn
uglifier
uglifier (>= 2.7.2)
unicorn (= 4.3.1)
webmock
whenever (= 0.9.2)
Expand Down

0 comments on commit 03a42c1

Please sign in to comment.