Merge branch 'ce-to-ee-2018-11-26' into 'master'

CE upstream - 2018-11-26 14:21 UTC

See merge request gitlab-org/gitlab-ee!8588

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

@@ -18,6 +18,6 @@
 - if @shared_runners_count.zero?
   = _('This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.')
 - else
-  %h4.underlined-title #{_('Available shared Runners :')} #{@shared_runners_count}
+  %h4.underlined-title #{_('Available shared Runners:')} #{@shared_runners_count}
   %ul.bordered-list.available-shared-runners
     = render partial: 'projects/runners/runner', collection: @shared_runners, as: :runner

locale/gitlab.pot

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