Merge branch '22805-container-registry-status' into 'master'

Add Container Registry on/off status to admin area ## What are the relevant issue numbers? Closes #22805 See merge request !6638

Merge branch '22805-container-registry-status' into 'master'
ccd89ec9 · Robert Speicher · 4be63f5b · 2a7f82f8 · ccd89ec9 · ccd89ec9
Commit ccd89ec9 authored Oct 04, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

index.html.haml app/views/admin/dashboard/index.html.haml +5 -0

No files found.
--- 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)
  - Fix "Copy to clipboard" tooltip to say "Copied!" when clipboard button is clicked. (lukehowell)

--- 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