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

Bump the rails gem minimum for CVEs #762

Merged
merged 1 commit into from
Oct 23, 2024
Merged

Conversation

Fryguy
Copy link
Member

@Fryguy Fryguy commented Oct 23, 2024

This is mostly for Mend, but it also enforces the minimum secure version.

@jrafanie jrafanie merged commit 075a130 into ManageIQ:master Oct 23, 2024
5 checks passed
@Fryguy Fryguy deleted the bump_for_cves branch October 23, 2024 14:45
@Fryguy
Copy link
Member Author

Fryguy commented Oct 24, 2024

@Fryguy A conflict occurred during the backport of this pull request to radjabov.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the radjabov branch in order to resolve this.

Conflict details:

diff --cc manageiq-schema.gemspec
index 8504448,ceaecc2..0000000
--- a/manageiq-schema.gemspec
+++ b/manageiq-schema.gemspec
@@@ -23,7 -23,7 +23,11 @@@ Gem::Specification.new do |spec
    spec.add_dependency "manageiq-password",       ">= 1.2.0", "< 2"
    spec.add_dependency "more_core_extensions",    ">= 3.5", "< 5"
    spec.add_dependency "pg"
++<<<<<<< HEAD
 +  spec.add_dependency "rails",                   ">=6.0.4", "<7.1"
++=======
+   spec.add_dependency "rails",                   ">=7.0.8.5", "<8.0"
++>>>>>>> 075a130 (Merge pull request #762 from Fryguy/bump_for_cves)
  
    spec.add_development_dependency "manageiq-style", ">= 1.5.2"
    spec.add_development_dependency "rspec"

@Fryguy
Copy link
Member Author

Fryguy commented Oct 24, 2024

I'm going to unmark this for backport and do it after the merge of master into the branch.

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