Skip to content

Commit

Permalink
Merge pull request #119 from railslink/chore/nokogiri-update
Browse files Browse the repository at this point in the history
Update Nokogiri to fix CVE-2019-13117
  • Loading branch information
brandondees committed Nov 18, 2019
2 parents 296c60e + da647aa commit 93ec3a5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Expand Up @@ -34,7 +34,7 @@ gem 'slim-rails' # slim templa
gem 'sprockets', '~> 3.7.2' # sprockets is a rack-based asset packaging system that concatenates and serves javascript, scss, etc
gem 'sucker_punch', '~> 2.0' # asynchronous processing library
gem 'uglifier', '>= 1.3.0' # compressor for javascript assets
gem 'nokogiri', '~> 1.10.4' # a HTML, XML, SAX, and Reader parser
gem 'nokogiri', '~> 1.10.5' # a HTML, XML, SAX, and Reader parser

group :development, :test do
gem 'rspec-rails', '~> 3.7' # testing framework
Expand All @@ -60,4 +60,3 @@ group :test do
end

gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] # windows does not include zoneinfo files, so bundle the tzinfo-data gem

4 changes: 2 additions & 2 deletions Gemfile.lock
Expand Up @@ -113,7 +113,7 @@ GEM
multi_xml (0.6.0)
multipart-post (2.0.0)
nio4r (2.3.1)
nokogiri (1.10.4)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
Expand Down Expand Up @@ -286,7 +286,7 @@ DEPENDENCIES
kramdown (~> 2.1.0)
listen (>= 3.0.5, < 3.2)
marginalia (~> 1.6.0)
nokogiri (~> 1.10.4)
nokogiri (~> 1.10.5)
oj (~> 3.9.2)
omniauth (= 1.8.1)
omniauth-slack (= 2.3.0)
Expand Down

0 comments on commit 93ec3a5

Please sign in to comment.