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

AO3-6297 Revert accidental gem downgrades in MimeMagic removal #4785

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

Bilka2
Copy link
Contributor

@Bilka2 Bilka2 commented Apr 7, 2024

Issue

https://otwarchive.atlassian.net/browse/AO3-6297

Purpose

The MimeMagic removal commit d40d751 had some extra changes in the Gemfile.lock that led to various gems getting downgraded. Most likely this was caused by a merge conflict. This commit reverts the extra changes.

Testing Instructions

No extra testing.

References

I noticed this because nokogiri got downgraded to a vulnerable version and dependabot opened #4784 to upgrade it again.

Comparison between this branch and master before d40d751: test-0.9.367.5...Bilka2:AO3-6297-bot. Shows that after this PR, only following things are changed in the Gemfile.lock:

  • The originally intended removal of MimeMagic.
  • Update of net-smtp from 0.4.0 to 0.5.0. This was also introduced with d40d751. I decided not to revert it because it's a version upgrade and based on the changelog there are no changes that affect us.
  • Minor nokogiri version bump (1.16.2 -> 1.16.3). Shouldn't matter and it was easier than forcing bundler to pick 1.16.2.
  • Update of bundler to 2.5.6, which is the version used in the Dockerfile.

Credit

Bilka (he/him)

Copy link
Member

@brianjaustin brianjaustin left a comment

Choose a reason for hiding this comment

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

Thank you! Very much not a fan of Gemfile.lock conflicts, I always seem to run into something nasty when trying to fix them 🤦

@brianjaustin brianjaustin merged commit bd57a26 into otwcode:master Apr 8, 2024
26 checks passed
@Bilka2 Bilka2 deleted the AO3-6297-bot branch April 8, 2024 05:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants