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

Update nokogiri to 1.13.10 #3230

Merged
merged 7 commits into from
Mar 22, 2023
Merged

Conversation

jlledom
Copy link
Contributor

@jlledom jlledom commented Mar 2, 2023

Updated Nokogiri to fix some vulnerabilities

I have no idea why my changes weren't committed to #3137. I'm creating this PR to continue with the issue.

The name Nokogiri::HTML has been deprecated, now it's Nokogiri::HTML4. Better change it now to avoid future problems when they remove the old name.

Also some tests failed and I had to fix them.

dependabot bot and others added 3 commits December 19, 2022 17:17
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.10.10...v1.13.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@jlledom
Copy link
Contributor Author

jlledom commented Mar 2, 2023

Can't be merged due to the licenses CI job, I'll merge this later on when #3148 is merged

@jlledom jlledom self-assigned this Mar 2, 2023
@akostadinov
Copy link
Contributor

@dependabot rebase

@akostadinov
Copy link
Contributor

I think it will not rebase due to extra changes on top of its own :(

@akostadinov
Copy link
Contributor

But also it cannot run the licenses task by itself. I wonder if that can be automated..

@@ -60,7 +60,7 @@ def setup
get :show

assert_response :success
page = Nokogiri::HTML::Document.parse(response.body)
page = Nokogiri::HTML4::Document.parse(response.body)
Copy link
Contributor

Choose a reason for hiding this comment

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

btw why change this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nokogiri::HTML as been deprecated and it's now called Nokogiri::HTML4 (see release notes). For the present version there's an alias so both are still working, but the former will be removed in future versions, so I'm advancing the work.

@jlledom jlledom changed the title Dependabot/bundler/nokogiri 1.13.10 Update nokogiri to 1.13.10 Mar 6, 2023
@jlledom jlledom requested a review from akostadinov March 6, 2023 09:01
thalesmiguel
thalesmiguel previously approved these changes Mar 9, 2023
app/lib/three_scale/json_representer.rb Show resolved Hide resolved
josemigallas
josemigallas previously approved these changes Mar 13, 2023
akostadinov
akostadinov previously approved these changes Mar 15, 2023
# Conflicts:
#	Gemfile.lock
#	doc/licenses/licenses.xml
@akostadinov
Copy link
Contributor

You have to rebase, otherwise changes get messed up :(

@jlledom jlledom merged commit 6135dc3 into master Mar 22, 2023
@jlledom jlledom deleted the dependabot/bundler/nokogiri-1.13.10 branch March 22, 2023 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants