Merge branch 'gt-update-string-struture-for-group-runners' into 'master'

Update string structure for group runners

See merge request gitlab-org/gitlab-ce!24187
This commit is contained in:
Fatih Acet 2019-01-09 22:11:19 +00:00
commit 4a6c7661ed
5 changed files with 10 additions and 8 deletions

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,5 @@
---
title: Update string structure for available group runners
merge_request: 24187
author: George Tsiolis
type: changed

View File

@ -876,10 +876,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:"

View File

@ -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