Merge branch 'patch-21' into 'master'

clarify runners currently online text

See merge request gitlab-org/gitlab-ce!21151

app/views/admin/runners/index.html.haml

@@ -49,7 +49,7 @@
         = submit_tag 'Search', class: 'btn'
 
     .float-right.light
-      Runners with last contact more than a minute ago: #{@active_runners_cnt}
+      Runners currently online: #{@active_runners_cnt}
 
   %br
 

changelogs/unreleased/runners-online.yml

@@ -0,0 +1,5 @@
+---
+title: Clarify current runners online text
+merge_request: 21151
+author: Ben Bodenmiller
+type: other

spec/features/admin/admin_runners_spec.rb

@@ -20,7 +20,7 @@ describe "Admin Runners" do
 
       it 'has all necessary texts' do
         expect(page).to have_text "Setup a shared Runner manually"
-        expect(page).to have_text "Runners with last contact more than a minute ago: 1"
+        expect(page).to have_text "Runners currently online: 1"
       end
 
       describe 'search' do
@@ -55,7 +55,7 @@ describe "Admin Runners" do
 
       it 'has all necessary texts including no runner message' do
         expect(page).to have_text "Setup a shared Runner manually"
-        expect(page).to have_text "Runners with last contact more than a minute ago: 0"
+        expect(page).to have_text "Runners currently online: 0"
         expect(page).to have_text 'No runners found'
       end
     end