Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
a3234f41
Commit
a3234f41
authored
Apr 12, 2018
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include git SHA with GitLab version
parent
947ed8b8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
0 deletions
+12
-0
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+1
-0
changelogs/unreleased/ash-mckenzie-include-sha-with-version.yml
...logs/unreleased/ash-mckenzie-include-sha-with-version.yml
+5
-0
spec/views/admin/dashboard/index.html.haml_spec.rb
spec/views/admin/dashboard/index.html.haml_spec.rb
+6
-0
No files found.
app/views/admin/dashboard/index.html.haml
View file @
a3234f41
...
@@ -126,6 +126,7 @@
...
@@ -126,6 +126,7 @@
GitLab
GitLab
%span
.pull-right
%span
.pull-right
=
Gitlab
::
VERSION
=
Gitlab
::
VERSION
=
"(
#{
Gitlab
::
REVISION
}
)"
%p
%p
GitLab Shell
GitLab Shell
%span
.pull-right
%span
.pull-right
...
...
changelogs/unreleased/ash-mckenzie-include-sha-with-version.yml
0 → 100644
View file @
a3234f41
---
title
:
git SHA is now displayed alongside the GitLab version on the Admin Dashboard
merge_request
:
author
:
type
:
added
spec/views/admin/dashboard/index.html.haml_spec.rb
View file @
a3234f41
...
@@ -18,4 +18,10 @@ describe 'admin/dashboard/index.html.haml' do
...
@@ -18,4 +18,10 @@ describe 'admin/dashboard/index.html.haml' do
expect
(
rendered
).
to
have_content
'GitLab Workhorse'
expect
(
rendered
).
to
have_content
'GitLab Workhorse'
expect
(
rendered
).
to
have_content
Gitlab
::
Workhorse
.
version
expect
(
rendered
).
to
have_content
Gitlab
::
Workhorse
.
version
end
end
it
"includes revision of GitLab"
do
render
expect
(
rendered
).
to
have_content
"
#{
Gitlab
::
VERSION
}
(
#{
Gitlab
::
REVISION
}
)"
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment