Skip to content

Temporarily pin Faraday related gems

Robert Marshall requested to merge 17379-resolve-net-http-conflicts into master

What does this MR do?

Temporarily pin Faraday related gems
    
- Faraday 2.9.0 introduced a dependency on net-http 0.3.0 which causes
  conflicts with the version of net-http specified in the Omnibus and
  GitLab Rails project Gemfiles. The version of net-http cannot be
  updated until DNS rebinding fixes are complete in the GitLab rails
  project, so this pins the Faraday gem versions as a stopgap until the
  real fix is ready, validated, and merged.
    
Related https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17379
    
Changelog: changed
    
Signed-off-by: Robert Marshall <rmarshall@gitlab.com>

Related issues

Related 2024-01-09: docker image in omnibus package for... (gitlab-com/gl-infra/production#17379 - closed) • Jason Plum, Robert Marshall+

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • MR title and description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • Latest Merge Result pipeline is green.
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow.

For GitLab team members

If you don't have access to this, the reviewer should trigger these jobs for you during the review process.

  • The manual Trigger:ee-package jobs have a green pipeline running against latest commit.
  • If config/software or config/patches directories are changed, make sure the build-package-on-all-os job within the Trigger:ee-package downstream pipeline succeeded.
  • If you are changing anything SSL related, then the Trigger:package:fips manual job within the Trigger:ee-package downstream pipeline must succeed.
  • If CI configuration is changed, the branch must be pushed to dev.gitlab.org to confirm regular branch builds aren't broken.

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes.
  • Documentation created/updated.
  • Tests added.
  • Integration tests added to GitLab QA.
  • Equivalent MR/issue for the GitLab Chart opened.
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.
Edited by Jason Plum

Merge request reports