Skip to content
Snippets Groups Projects
Commit 7023dd67 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'sh-ensure-ruby-md5' into 'master'

Fix Ruby MD5 not always being available in FIPS mode

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6357



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
parents a8834bad 7dc9ff3f
No related branches found
No related tags found
1 merge request!85Merged upstream 15.5.0+rc42.ce.0
......@@ -26,7 +26,7 @@
# link: https://docs.gitlab.com/ee/development/ruby_upgrade.html
default_version '2.7.5'
fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false
fips_enabled = Build::Check.use_system_ssl?
dependency 'zlib'
dependency 'openssl' unless Build::Check.use_system_ssl?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment