Skip to content
This repository has been archived by the owner on Apr 16, 2023. It is now read-only.

Update Nokogiri to fix CVE-2015-8806 #3

Merged
merged 1 commit into from
Jul 4, 2016
Merged
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'grape-swagger', '~> 0.10.2'
gem 'json', '~> 1.8.3'
gem 'kaminari', '~> 0.16.3'
gem 'mime-types', '~> 2.6.2'
gem 'nokogiri', '1.6.7.2'
gem 'nokogiri', '1.6.8'
gem 'rack', '~> 1.6.0'
gem 'rack-cors', '~> 0.4.0'
gem 'sqlite3', '~> 1.3.11'
Expand Down
12 changes: 7 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,21 @@ GEM
lumberjack (1.0.10)
method_source (0.8.2)
mime-types (2.6.2)
mini_portile2 (2.0.0)
mini_portile2 (2.1.0)
minitest (5.8.4)
multi_json (1.11.2)
multi_xml (0.5.5)
nenv (0.3.0)
netrc (0.11.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
parser (2.3.0.7)
ast (~> 2.2)
pkg-config (1.1.7)
powerpack (0.1.1)
pry (0.10.3)
coderay (~> 1.1.0)
Expand Down Expand Up @@ -237,7 +239,7 @@ DEPENDENCIES
json (~> 1.8.3)
kaminari (~> 0.16.3)
mime-types (~> 2.6.2)
nokogiri (= 1.6.7.2)
nokogiri
rack (~> 1.6.0)
rack-console (~> 1.3.1)
rack-cors (~> 0.4.0)
Expand All @@ -249,4 +251,4 @@ DEPENDENCIES
sqlite3 (~> 1.3.11)

BUNDLED WITH
1.11.2
1.12.5