Automatic merge of gitlab-org/gitlab-ce master

Gemfile.lock

@@ -116,7 +116,7 @@ GEM
     capybara-screenshot (1.0.22)
       capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.3.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)

app/views/groups/runners/_group_runners.html.haml

@@ -21,6 +21,6 @@
 
 - else
   %h4.underlined-title
-    = _('Available group Runners : %{runners}.').html_safe % { runners: @group.runners.count }
+    = _('Available group Runners: %{runners}').html_safe % { runners: @group.runners.count }
   %ul.bordered-list
     = render partial: 'groups/runners/runner', collection: @group.runners, as: :runner

app/views/projects/runners/_group_runners.html.haml

@@ -32,6 +32,6 @@
 
 - else
   %h4.underlined-title
-    = _('Available group Runners : %{runners}').html_safe % { runners: @group_runners.count }
+    = _('Available group Runners: %{runners}').html_safe % { runners: @group_runners.count }
   %ul.bordered-list
     = render partial: 'projects/runners/runner', collection: @group_runners, as: :runner

changelogs/unreleased/gt-update-string-struture-for-group-runners.yml

+---
+title: Update string structure for available group runners
+merge_request: 24187
+author: George Tsiolis
+type: changed

locale/gitlab.pot

@@ -1096,10 +1096,7 @@ msgstr ""
 msgid "Available"
 msgstr ""
 
-msgid "Available group Runners : %{runners}"
-msgstr ""
-
-msgid "Available group Runners : %{runners}."
+msgid "Available group Runners: %{runners}"
 msgstr ""
 
 msgid "Available shared Runners:"

spec/features/runners_spec.rb

@@ -236,7 +236,7 @@ describe 'Runners' do
         it 'group runners are available' do
           visit project_runners_path(project)
 
-          expect(page).to have_content 'Available group Runners : 1'
+          expect(page).to have_content 'Available group Runners: 1'
           expect(page).to have_content 'group-runner'
         end
 
@@ -279,7 +279,7 @@ describe 'Runners' do
         visit group_settings_ci_cd_path(group)
 
         expect(page).not_to have_content 'This group does not provide any group Runners yet'
-        expect(page).to have_content 'Available group Runners : 1'
+        expect(page).to have_content 'Available group Runners: 1'
         expect(page).to have_content 'group-runner'
       end