diff --git a/.ruby-version b/.ruby-version index 6d90a7b4e3b6bcbe0acb077155702cc1747ed440_LnJ1YnktdmVyc2lvbg==..d21fa4850d577071b0e228025438d2adbb18c238_LnJ1YnktdmVyc2lvbg== 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1,1 +1,1 @@ -2.4.5 +2.5.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d90a7b4e3b6bcbe0acb077155702cc1747ed440_Q0hBTkdFTE9HLm1k..d21fa4850d577071b0e228025438d2adbb18c238_Q0hBTkdFTE9HLm1k 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +11.6.0 + +- Upgrade Ruby to 2.5.3 !2806 + 11.5.0 - Add experimental support for Puma !2801 diff --git a/config/software/ruby.rb b/config/software/ruby.rb index 6d90a7b4e3b6bcbe0acb077155702cc1747ed440_Y29uZmlnL3NvZnR3YXJlL3J1YnkucmI=..d21fa4850d577071b0e228025438d2adbb18c238_Y29uZmlnL3NvZnR3YXJlL3J1YnkucmI= 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -28,7 +28,7 @@ # - verify that all ffi libs are available for your version on all platforms. # - when upgrading please check the ABI version and update the exclusion until # https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3414 is addressed -default_version '2.4.5' +default_version '2.5.3' fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false @@ -44,7 +44,7 @@ # and that's the only one we will ever use. dependency 'libiconv' -version('2.4.5') { source sha256: '6737741ae6ffa61174c8a3dcdd8ba92bc38827827ab1d7ea1ec78bc3cefc5198' } +version('2.5.3') { source sha256: '9828d03852c37c20fa333a0264f2490f07338576734d910ee3fd538c9520846c' } source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz"