diff --git a/CHANGELOG b/CHANGELOG index 7f9dfd98cd7a5659511e8869f0da9ea4938bd2c0..c57be02e65a1d247e964499dffb3f709cff76ee9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,8 @@ v 8.3.0 (unreleased) - Do not show build status unless builds are enabled and `.gitlab-ci.yml` is present - Persist runners registration token in database - Fix online editor should not remove newlines at the end of the file + - Expose Git's version in the admin area + v 8.2.3 - Fix application settings cache not expiring after changes (Stan Hu) diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 8657d2c71fe83eae1a39a5b521ca922acbbdca4c..531247e9148565a0e3b475a435c5a5bd709858bb 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -79,6 +79,10 @@ GitLab API %span.pull-right = API::API::version + %p + Git + %span.pull-right + = Gitlab::Git.version %p Ruby %span.pull-right diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb index 0c350d7c675e1977077944a7c1eff2f5a355c93b..f065cc5e9e9962c70407370403881452dab5c795 100644 --- a/lib/gitlab/git.rb +++ b/lib/gitlab/git.rb @@ -20,6 +20,10 @@ def branch_ref?(ref) def blank_ref?(ref) ref == BLANK_SHA end + + def version + Gitlab::VersionInfo.parse(Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} --version)).first) + end end end end