From 391a9f650eb6b29b716777972bb3c9cc62763a88 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 23 Jun 2016 08:19:54 -0400
Subject: [PATCH] Fix styling
---
CHANGELOG | 1 +
app/views/admin/background_jobs/_head.html.haml | 8 ++++----
app/views/admin/system_info/show.html.haml | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 05566f36338..979c9e6e30d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.10.0 (unreleased)
- Remove unused front-end variable -> default_issues_tracker
- Add API endpoint for a group issues !4520 (mahcsig)
- Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
+ - Add basic system information like memory and disk usage to the admin panel
v 8.9.3 (unreleased)
- Decreased min width of screen to 1280px for pinned sidebar
diff --git a/app/views/admin/background_jobs/_head.html.haml b/app/views/admin/background_jobs/_head.html.haml
index 5ad99a7f6e0..9d722bd7382 100644
--- a/app/views/admin/background_jobs/_head.html.haml
+++ b/app/views/admin/background_jobs/_head.html.haml
@@ -1,9 +1,9 @@
.nav-links.sub-nav
%ul{ class: (container_class) }
- = nav_link(controller: :system_info) do
- = link_to admin_system_info_path, title: 'System Info' do
- %span
- System Info
+ = nav_link(controller: :system_info) do
+ = link_to admin_system_info_path, title: 'System Info' do
+ %span
+ System Info
= nav_link(controller: :background_jobs) do
= link_to admin_background_jobs_path, title: 'Background Jobs' do
%span
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 01496e4fcf5..2a1fac6e48b 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -3,7 +3,7 @@
= render 'admin/background_jobs/head'
%div{ class: (container_class) }
- %p
+ .prepend-top-default
.row
.col-sm-4
.light-well
--
GitLab