diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-22 10:20:47 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-22 10:20:47 +0000 |
| commit | cd7f2d35aef4442a72b1e99da4cd02d8ac50d2fc (patch) | |
| tree | c0a73ee5fff6766d9cbe7cb1ed877aafa8e3e8b4 | |
| parent | 2bc4a17decf943123f5adff0ea624eef325d776d (diff) | |
| parent | e94001ba89d4c59e981254b1434789f707071990 (diff) | |
| download | gitlab-ce-cd7f2d35aef4442a72b1e99da4cd02d8ac50d2fc.tar.gz | |
Merge branch '46950-systemcheck-use-gem-ruby-instead-of-hardcoding-ruby-version' into 'master'
SystemCheck: Use a more reliable way to detect current Ruby version
Closes #46950
See merge request gitlab-org/gitlab-ce!23291
| -rw-r--r-- | changelogs/unreleased/46950-systemcheck-ruby-version.yml | 5 | ||||
| -rw-r--r-- | lib/system_check/app/ruby_version_check.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/46950-systemcheck-ruby-version.yml b/changelogs/unreleased/46950-systemcheck-ruby-version.yml new file mode 100644 index 00000000000..e556e14223b --- /dev/null +++ b/changelogs/unreleased/46950-systemcheck-ruby-version.yml @@ -0,0 +1,5 @@ +--- +title: 'SystemCheck: Use a more reliable way to detect current Ruby version' +merge_request: 23291 +author: +type: changed diff --git a/lib/system_check/app/ruby_version_check.rb b/lib/system_check/app/ruby_version_check.rb index d73c39f2c3f..60e07718338 100644 --- a/lib/system_check/app/ruby_version_check.rb +++ b/lib/system_check/app/ruby_version_check.rb @@ -11,7 +11,7 @@ module SystemCheck end def self.current_version - @current_version ||= Gitlab::VersionInfo.parse(Gitlab::TaskHelpers.run_command(%w(ruby --version))) + @current_version ||= Gitlab::VersionInfo.parse(RUBY_VERSION) end def check? |