Merge branch '31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard' into 'master'

Display Shared Runner status in Admin Dashboard

Closes #31602

See merge request !11783
This commit is contained in:
Rémy Coutable 2017-06-01 10:56:21 +00:00
commit b410322990
2 changed files with 10 additions and 0 deletions

View File

@ -79,6 +79,12 @@
= gitlab_pages
%span.light.pull-right
= boolean_to_icon gitlab_pages_enabled
- gitlab_shared_runners = 'Shared Runners'
- gitlab_shared_runners_enabled = Gitlab.config.gitlab_ci.shared_runners_enabled
%p{ "aria-label" => "#{gitlab_shared_runners}: status " + (gitlab_shared_runners_enabled ? "on" : "off") }
= gitlab_shared_runners
%span.light.pull-right
= boolean_to_icon gitlab_shared_runners_enabled
.col-md-4
%h4

View File

@ -0,0 +1,4 @@
---
title: Display Shared Runner status in Admin Dashboard
merge_request: 11783
author: Ivan Chernov