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.

Sign up for GitHub

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

Resolves gem vulnerability issues with Nokogiri #2989

Merged
merged 2 commits into from
Apr 22, 2019
Merged

Resolves gem vulnerability issues with Nokogiri #2989

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce1b0bb
Resolves gem vulnerability issues
hpjaj Apr 22, 2019
4a3d276
Bundles with former version of bundler
hpjaj Apr 22, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ gem 'mail', '2.6.6'
gem 'memoist'
gem 'mini_magick'
gem 'net-sftp'
gem 'nokogiri', '1.8.5'
gem 'nokogiri', '~> 1.10', '>= 1.10.3'
Copy link
Contributor

@annaswims annaswims Apr 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is strange to me, but probably fine. '~> 1.10.3' is the same as >= 1.10.3 and < 1.11

https://bundler.io/gemfile.html

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@annaswims As noted, ~> 1.10.3 is the same as >= 1.10.3 and < 1.11.
But, '~> 1.10', '>= 1.10.3' means >= 1.10.3 and < 2.0.
(It is a subset of just ~> 1.10)

gem 'octokit'
gem 'oj' # Amazon Linux `json` gem causes conflicts, but `multi_json` will prefer `oj` if installed
gem 'olive_branch'
Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,8 +727,8 @@ GEM
faraday (>= 0.7.4, < 0.10)
multi_json (~> 1.0)
builder (3.2.3)
bundler-audit (0.5.0)
bundler (~> 1.2)
bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3)
thor (~> 0.18)
byebug (8.2.2)
carrierwave (0.11.2)
Expand Down Expand Up @@ -864,7 +864,7 @@ GEM
mime-types-data (3.2018.0812)
mimemagic (0.3.2)
mini_magick (4.7.0)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.0.0)
Expand All @@ -873,8 +873,8 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (4.1.0)
nio4r (2.3.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
nori (2.6.0)
notiffany (0.0.8)
nenv (~> 0.1)
Expand Down Expand Up @@ -1189,7 +1189,7 @@ DEPENDENCIES
memoist
mini_magick
net-sftp
nokogiri (= 1.8.5)
nokogiri (~> 1.10, >= 1.10.3)
octokit
oj
olive_branch
Expand Down Expand Up @@ -1260,4 +1260,4 @@ DEPENDENCIES
zero_downtime_migrations

BUNDLED WITH
1.17.3
2.0.1