Commit e209ba70 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'git-version' into 'master'

Show git version on admin page

Before
![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png)

After
![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png)

gitlab-org/gitlab-ce#4077




See merge request !2101
parents 058f27ad 75ad9fff
...@@ -59,6 +59,8 @@ v 8.3.0 (unreleased) ...@@ -59,6 +59,8 @@ v 8.3.0 (unreleased)
- Do not show build status unless builds are enabled and `.gitlab-ci.yml` is present - Do not show build status unless builds are enabled and `.gitlab-ci.yml` is present
- Persist runners registration token in database - Persist runners registration token in database
- Fix online editor should not remove newlines at the end of the file - 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 v 8.2.3
- Fix application settings cache not expiring after changes (Stan Hu) - Fix application settings cache not expiring after changes (Stan Hu)
......
...@@ -79,6 +79,10 @@ ...@@ -79,6 +79,10 @@
GitLab API GitLab API
%span.pull-right %span.pull-right
= API::API::version = API::API::version
%p
Git
%span.pull-right
= Gitlab::Git.version
%p %p
Ruby Ruby
%span.pull-right %span.pull-right
......
...@@ -20,6 +20,10 @@ module Gitlab ...@@ -20,6 +20,10 @@ module Gitlab
def blank_ref?(ref) def blank_ref?(ref)
ref == BLANK_SHA ref == BLANK_SHA
end end
def version
Gitlab::VersionInfo.parse(Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} --version)).first)
end
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment