summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-06-08 08:21:39 +0000
committerValery Sizov <valery@gitlab.com>2015-06-08 08:21:39 +0000
commit36dbe836bdf65563ee04dd4a819f8ccef5c9b831 (patch)
tree86fa61d614686b71ea25f900cb34c1736758e827 /app/views
parent324f8ea6aa1778fcd1bfc65f47e63d0df5ce08ed (diff)
parent281a36a0144f0385d8453d047a5b55aa9cc6f1ad (diff)
downloadgitlab-ci-36dbe836bdf65563ee04dd4a819f8ccef5c9b831.tar.gz
Merge branch 'active_runners' into 'master'
Show number of runners actively checking in on runners page https://dev.gitlab.org/gitlab/gitlab-ci/issues/241 ![joxi_screenshot_1433751389715](https://gitlab.com/gitlab-org/gitlab-ci/uploads/6f08e9e35a5c63396486d46792b703dc/joxi_screenshot_1433751389715.png) See merge request !127
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/runners/index.html.haml16
1 files changed, 11 insertions, 5 deletions
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 966de9c..5935aa2 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -23,11 +23,17 @@
%span.label.label-danger paused
\- runner will not receive any new build
-.append-bottom-20
- = form_tag admin_runners_path, class: 'form-inline', method: :get do
- .form-group
- = search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner description or token'
- = submit_tag 'Search', class: 'btn'
+.append-bottom-20.clearfix
+ .pull-left
+ = form_tag admin_runners_path, class: 'form-inline', method: :get do
+ .form-group
+ = search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner description or token'
+ = submit_tag 'Search', class: 'btn'
+
+ .pull-right.light
+ Runners with last contact less than a minute ago: #{@active_runners_cnt}
+
+%br
%table.table
%thead