summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthe-undefined <joe@joejames.io>2016-10-02 14:42:36 +0100
committerthe-undefined <joe@joejames.io>2016-10-03 15:53:59 +0100
commit2a7f82f8e4b0a89653cd21a3a1c34b51f3b4c141 (patch)
tree4a797bc5522c7f41af030a6e918ec9fc5c310043
parent958815a039af68dc68b333b69b3e9e3f3bc4ee2e (diff)
downloadgitlab-ce-2a7f82f8e4b0a89653cd21a3a1c34b51f3b4c141.tar.gz
Add Container Registry on/off status to admin area
Display the on/off icon under the "Features" section of the admin area for the Container Registry. Closes !22805
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/admin/dashboard/index.html.haml5
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 58f1e4a59c2..0be70f669c0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.13.0 (unreleased)
- Fix broken repository 500 errors in project list
- Close todos when accepting merge requests via the API !6486 (tonygambone)
- Changed Slack service user referencing from full name to username (Sebastian Poxhofer)
+ - Add Container Registry on/off status to Admin Area !6638 (the-undefined)
v 8.12.4 (unreleased)
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index e6687f43816..90798c47d97 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -63,6 +63,11 @@
Reply by email
%span.light.pull-right
= boolean_to_icon Gitlab::IncomingEmail.enabled?
+ %p
+ Container Registry
+ %span.light.pull-right
+ = boolean_to_icon Gitlab.config.registry.enabled
+
.col-md-4
%h4
Components