diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-10-04 08:42:39 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-10-04 08:42:39 +0000 |
| commit | ccd89ec965aa26812b4e48aabc15ca1594914b66 (patch) | |
| tree | 2e2091fa17783d627cb2264f4b6dcf68f1840fb7 | |
| parent | 4be63f5b5bd9c0859f5ba2b91ecdbdcc57b69b98 (diff) | |
| parent | 2a7f82f8e4b0a89653cd21a3a1c34b51f3b4c141 (diff) | |
| download | gitlab-ce-ccd89ec965aa26812b4e48aabc15ca1594914b66.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 806196d811d..57f6034b744 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) - Fix "Copy to clipboard" tooltip to say "Copied!" when clipboard button is clicked. (lukehowell) 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 |