diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-20 09:00:32 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-20 09:00:32 +0000 |
| commit | b60415c2b7deb2dfc8147445bee52022c128d416 (patch) | |
| tree | ea67e17fb18cdff783486a1ba1c1ceab66c653d3 /lib | |
| parent | ae20de7afc189c13ca039a448b3643b155b6c44e (diff) | |
| parent | 5607c57c41a57cb6cbd8c2df90ad0cda6138964a (diff) | |
| download | gitlab-ce-b60415c2b7deb2dfc8147445bee52022c128d416.tar.gz | |
Merge branch '48105-git-version-detection-using-gitaly' into 'master'
Move git version detection to gitaly for usage ping data
Closes #48105 and charts/gitlab#530
See merge request gitlab-org/gitlab-ce!19993
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/version.rb b/lib/gitlab/git/version.rb index 11184ca3457..1e14e8b652a 100644 --- a/lib/gitlab/git/version.rb +++ b/lib/gitlab/git/version.rb @@ -4,7 +4,7 @@ module Gitlab extend Gitlab::Git::Popen def self.git_version - Gitlab::VersionInfo.parse(popen(%W(#{Gitlab.config.git.bin_path} --version), nil).first) + Gitlab::VersionInfo.parse(Gitaly::Server.all.first.git_binary_version) end end end |