diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-01 13:56:21 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-01 13:56:21 +0300 |
| commit | b410322990f6f5b656aaac00c4a4a3b810944eac (patch) | |
| tree | f84b0d7a996facdd45946c0640be5529984becdd | |
| parent | c1ee45953edac729bc43f676cfad3359f9b2a2f5 (diff) | |
| parent | 86caebaf528d5f54e8ff91da7a429260db07d5ea (diff) | |
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
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard.yml | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 53f0a1e7fde..3c9f932a225 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -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 diff --git a/changelogs/unreleased/31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard.yml b/changelogs/unreleased/31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard.yml new file mode 100644 index 00000000000..00957f7e4f7 --- /dev/null +++ b/changelogs/unreleased/31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard.yml @@ -0,0 +1,4 @@ +--- +title: Display Shared Runner status in Admin Dashboard +merge_request: 11783 +author: Ivan Chernov |