summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-07 10:05:02 +0000
committerRémy Coutable <remy@rymai.me>2017-03-07 10:05:02 +0000
commit9533fc355c956a9a8f8c357c5f6f7a503cdd1344 (patch)
tree22496c3a9d51eb5be9a4a69445a406704e1d2eca /lib/tasks
parent56814482d66edd49fc8eeb26896e6cfe788b984e (diff)
parente73b68a74217cf736dafd2ce1448292f3df5543d (diff)
downloadgitlab-ce-9533fc355c956a9a8f8c357c5f6f7a503cdd1344.tar.gz
Merge branch 'add-git-version-to-system-info' into 'master'
Add git version to gitlab:env:info Closes #25376 See merge request !9128
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/info.rake3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake
index ae78fe64eb8..b8dd654b9a9 100644
--- a/lib/tasks/gitlab/info.rake
+++ b/lib/tasks/gitlab/info.rake
@@ -14,6 +14,8 @@ namespace :gitlab do
rake_version = run_and_match(%w(rake --version), /[\d\.]+/).try(:to_s)
# check redis version
redis_version = run_and_match(%w(redis-cli --version), /redis-cli (\d+\.\d+\.\d+)/).to_a
+ # check Git version
+ git_version = run_and_match([Gitlab.config.git.bin_path, '--version'], /git version ([\d\.]+)/).to_a
puts ""
puts "System information".color(:yellow)
@@ -26,6 +28,7 @@ namespace :gitlab do
puts "Bundler Version:#{bunder_version || "unknown".color(:red)}"
puts "Rake Version:\t#{rake_version || "unknown".color(:red)}"
puts "Redis Version:\t#{redis_version[1] || "unknown".color(:red)}"
+ puts "Git Version:\t#{git_version[1] || "unknown".color(:red)}"
puts "Sidekiq Version:#{Sidekiq::VERSION}"
# check database adapter