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
This commit is contained in:
commit
e209ba7002
|
@ -59,6 +59,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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue