Commit 4a6c7661 authored by Fatih Acet's avatar Fatih Acet

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
parents 928d974a 29acc3b4
...@@ -21,6 +21,6 @@ ...@@ -21,6 +21,6 @@
- else - else
%h4.underlined-title %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 %ul.bordered-list
= render partial: 'groups/runners/runner', collection: @group.runners, as: :runner = render partial: 'groups/runners/runner', collection: @group.runners, as: :runner
...@@ -32,6 +32,6 @@ ...@@ -32,6 +32,6 @@
- else - else
%h4.underlined-title %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 %ul.bordered-list
= render partial: 'projects/runners/runner', collection: @group_runners, as: :runner = render partial: 'projects/runners/runner', collection: @group_runners, as: :runner
---
title: Update string structure for available group runners
merge_request: 24187
author: George Tsiolis
type: changed
...@@ -876,10 +876,7 @@ msgstr "" ...@@ -876,10 +876,7 @@ msgstr ""
msgid "Available" msgid "Available"
msgstr "" msgstr ""
msgid "Available group Runners : %{runners}" msgid "Available group Runners: %{runners}"
msgstr ""
msgid "Available group Runners : %{runners}."
msgstr "" msgstr ""
msgid "Available shared Runners:" msgid "Available shared Runners:"
......
...@@ -236,7 +236,7 @@ describe 'Runners' do ...@@ -236,7 +236,7 @@ describe 'Runners' do
it 'group runners are available' do it 'group runners are available' do
visit project_runners_path(project) 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' expect(page).to have_content 'group-runner'
end end
...@@ -279,7 +279,7 @@ describe 'Runners' do ...@@ -279,7 +279,7 @@ describe 'Runners' do
visit group_settings_ci_cd_path(group) visit group_settings_ci_cd_path(group)
expect(page).not_to have_content 'This group does not provide any group Runners yet' 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' expect(page).to have_content 'group-runner'
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment