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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f547a473
Commit
f547a473
authored
May 23, 2017
by
jboltz88
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
31616-add-uptime-of-gitlab-instance-in-admin-area
parent
ad47f209
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
0 deletions
+13
-0
app/views/admin/system_info/show.html.haml
app/views/admin/system_info/show.html.haml
+5
-0
changelogs/unreleased/31616-add-uptime-of-gitlab-instance-in-admin-area.yml
...sed/31616-add-uptime-of-gitlab-instance-in-admin-area.yml
+4
-0
config/initializers/server_uptime.rb
config/initializers/server_uptime.rb
+1
-0
spec/features/admin/admin_system_info_spec.rb
spec/features/admin/admin_system_info_spec.rb
+3
-0
No files found.
app/views/admin/system_info/show.html.haml
View file @
f547a473
...
...
@@ -31,3 +31,8 @@
%h1
#{
number_to_human_size
(
disk
[
:bytes_used
])
}
/
#{
number_to_human_size
(
disk
[
:bytes_total
])
}
%p
=
disk
[
:disk_name
]
%p
=
disk
[
:mount_path
]
.col-sm-4
.light-well
%h4
Uptime
.data
%h1
=
time_ago_with_tooltip
(
Rails
.
application
.
config
.
booted_at
)
changelogs/unreleased/31616-add-uptime-of-gitlab-instance-in-admin-area.yml
0 → 100644
View file @
f547a473
---
title
:
Add server uptime to System Info page in admin dashboard
merge_request
:
11590
author
:
Justin Boltz
config/initializers/server_uptime.rb
0 → 100644
View file @
f547a473
Rails
.
application
.
config
.
booted_at
=
Time
.
now
spec/features/admin/admin_system_info_spec.rb
View file @
f547a473
...
...
@@ -20,6 +20,7 @@ describe 'Admin System Info' do
expect
(
page
).
to
have_content
'CPU 2 cores'
expect
(
page
).
to
have_content
'Memory 4 GB / 16 GB'
expect
(
page
).
to
have_content
'Disks'
expect
(
page
).
to
have_content
'Uptime'
end
end
...
...
@@ -34,6 +35,7 @@ describe 'Admin System Info' do
expect
(
page
).
to
have_content
'CPU Unable to collect CPU info'
expect
(
page
).
to
have_content
'Memory 4 GB / 16 GB'
expect
(
page
).
to
have_content
'Disks'
expect
(
page
).
to
have_content
'Uptime'
end
end
...
...
@@ -48,6 +50,7 @@ describe 'Admin System Info' do
expect
(
page
).
to
have_content
'CPU 2 cores'
expect
(
page
).
to
have_content
'Memory Unable to collect memory info'
expect
(
page
).
to
have_content
'Disks'
expect
(
page
).
to
have_content
'Uptime'
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