diff options
| author | Trey Davis <trey@pogoseat.com> | 2015-12-14 17:30:55 -0800 |
|---|---|---|
| committer | Trey Davis <trey@pogoseat.com> | 2015-12-15 08:02:19 -0800 |
| commit | 75ad9fff4e1293776e077b402b7e0bfcff3391d0 (patch) | |
| tree | 94afefa9ccbd676d6d344be58dc752db97db10f6 | |
| parent | 2b4a3bc524c0db3f6e4e3d2b2f34ec29e358b240 (diff) | |
| download | gitlab-ce-75ad9fff4e1293776e077b402b7e0bfcff3391d0.tar.gz | |
Show git version on admin page
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 4 | ||||
| -rw-r--r-- | lib/gitlab/git.rb | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7f9dfd98cd7..c57be02e65a 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 8657d2c71fe..531247e9148 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -80,6 +80,10 @@ %span.pull-right = API::API::version %p + Git + %span.pull-right + = Gitlab::Git.version + %p Ruby %span.pull-right #{RUBY_VERSION}p#{RUBY_PATCHLEVEL} diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb index 0c350d7c675..f065cc5e9e9 100644 --- a/lib/gitlab/git.rb +++ b/lib/gitlab/git.rb @@ -20,6 +20,10 @@ module Gitlab 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 |