Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Snyk] Fix for 2 vulnerabilities #60

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem 'uglifier', ">= 1.3.0"
gem 'sass-rails', "5.0.6"
gem 'airbrake', '~> 4.3.1'

gem 'nokogiri', "~> 1.6.6.4"
gem 'nokogiri', '~> 1.10.5.0'
gem 'sprockets-rails', "2.3.3" #FIXME: This is temporary, will allow to upgrade rails to 4.2.5.1 to address security fixes without breaking tests http://weblog.rubyonrails.org/2016/1/25/Rails-5-0-0-beta1-1-4-2-5-1-4-1-14-1-3-2-22-1-and-rails-html-sanitizer-1-0-3-have-been-released/

group :development do
Expand All @@ -33,7 +33,7 @@ group :test do
end

group :development, :test do
gem 'jasmine-rails', '~> 0.10.6'
gem 'jasmine-rails', '~> 0.10.8'
gem 'quiet_assets', '1.1.0'
gem 'govuk-lint', '~> 0.6.0'
gem 'pry'
Expand Down
90 changes: 55 additions & 35 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ GEM
airbrake (4.3.1)
builder
multi_json
arel (6.0.3)
arel (6.0.4)
ast (2.2.0)
astrolabe (1.3.1)
parser (~> 2.2)
Expand All @@ -53,17 +53,19 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
builder (3.2.4)
capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
coderay (1.1.0)
concurrent-ruby (1.0.2)
concurrent-ruby (1.2.2)
crack (0.4.2)
safe_yaml (~> 1.0.0)
crass (1.0.6)
date (3.3.3)
debug_inspector (0.0.2)
domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
Expand All @@ -78,21 +80,22 @@ GEM
plek (>= 1.9.0)
rack-cache
rest-client (~> 2.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
govuk-content-schema-test-helpers (1.4.0)
json-schema (~> 2.5.1)
govuk-lint (0.6.1)
rubocop (~> 0.35.0)
scss_lint (~> 0.44.0)
govuk_frontend_toolkit (5.1.0)
govuk_frontend_toolkit (5.1.3)
rails (>= 3.1.0)
sass (>= 3.2.0)
govuk_template (0.19.0)
rails (>= 3.1)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
image_optim (0.17.1)
exifr (~> 1.1, >= 1.1.3)
fspath (~> 2.1)
Expand All @@ -101,45 +104,61 @@ GEM
progress (~> 3.0, >= 3.0.1)
image_size (1.4.1)
in_threads (1.3.1)
jasmine-core (2.3.4)
jasmine-core (2.99.2)
jasmine-rails (0.10.8)
jasmine-core (>= 1.3, < 3.0)
phantomjs (>= 1.9)
railties (>= 3.2.0)
sprockets-rails
json (1.8.3)
json (1.8.6)
json-schema (2.5.2)
addressable (~> 2.3.8)
kgio (2.10.0)
link_header (0.0.8)
logstash-event (1.1.5)
logstasher (0.4.8)
logstash-event (~> 1.1.0)
loofah (2.0.3)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lrucache (0.1.4)
PriorityQueue (~> 0.1.2)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
metaclass (0.0.4)
method_source (0.8.2)
mime-types (2.99.2)
mini_portile (0.6.2)
minitest (5.10.1)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mini_mime (1.1.2)
mini_portile2 (2.4.0)
minitest (5.18.0)
minitest-capybara (0.7.2)
capybara (~> 2.2)
minitest (~> 5.0)
rake
mocha (1.1.0)
metaclass (~> 0.0.1)
multi_json (1.11.2)
net-imap (0.3.4)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
netrc (0.11.0)
nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
null_logger (0.0.1)
parser (2.3.0.6)
ast (~> 2.2)
phantomjs (1.9.8.0)
phantomjs (2.1.1.0)
plek (1.11.0)
power_assert (0.2.4)
powerpack (0.1.1)
Expand All @@ -150,7 +169,7 @@ GEM
slop (~> 3.4)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.5)
rack (1.6.13)
rack-cache (1.6.1)
rack (>= 0.4)
rack-test (0.6.3)
Expand All @@ -167,14 +186,14 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
Expand All @@ -196,7 +215,7 @@ GEM
tins (<= 1.6.0)
ruby-progressbar (1.7.5)
safe_yaml (1.0.4)
sass (3.4.22)
sass (3.4.25)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand All @@ -213,7 +232,7 @@ GEM
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
slop (3.6.0)
sprockets (3.7.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
Expand All @@ -222,11 +241,12 @@ GEM
sprockets (>= 2.8, < 4.0)
test-unit (3.1.3)
power_assert
thor (0.19.4)
thread_safe (0.3.5)
tilt (2.0.5)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.1.0)
timeout (0.3.2)
tins (1.6.0)
tzinfo (1.2.2)
tzinfo (1.2.11)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
Expand All @@ -241,7 +261,7 @@ GEM
webmock (1.21.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
xpath (2.0.0)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
Expand All @@ -259,12 +279,12 @@ DEPENDENCIES
govuk_frontend_toolkit (~> 5.1.0)
govuk_template (= 0.19.0)
image_optim (= 0.17.1)
jasmine-rails (~> 0.10.6)
jasmine-rails (~> 0.10.8)
logstasher (= 0.4.8)
minitest
minitest-capybara (~> 0.7.2)
mocha (~> 1.1.0)
nokogiri (~> 1.6.6.4)
nokogiri (~> 1.10.5.0)
plek (= 1.11.0)
pry
quiet_assets (= 1.1.0)
Expand All @@ -279,4 +299,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.13.7
1.17.3