summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Tsiolis <tsiolis.g@gmail.com>2019-01-09 22:11:18 +0000
committerFatih Acet <acetfatih@gmail.com>2019-01-09 22:11:18 +0000
commit29acc3b4195c6cca6fdfa9679980d7f78fd11470 (patch)
tree0cbd14910160eb5e9c3efedf1ac1a2945a762f04
parent928d974a6b36d0a50631aad5581527e6b2c369dc (diff)
downloadgitlab-ce-29acc3b4195c6cca6fdfa9679980d7f78fd11470.tar.gz
Update string structure for group runners
-rw-r--r--app/views/groups/runners/_group_runners.html.haml2
-rw-r--r--app/views/projects/runners/_group_runners.html.haml2
-rw-r--r--changelogs/unreleased/gt-update-string-struture-for-group-runners.yml5
-rw-r--r--locale/gitlab.pot5
-rw-r--r--spec/features/runners_spec.rb4
5 files changed, 10 insertions, 8 deletions
diff --git a/app/views/groups/runners/_group_runners.html.haml b/app/views/groups/runners/_group_runners.html.haml
index bcfb6d99716..806a24e2bbc 100644
--- a/app/views/groups/runners/_group_runners.html.haml
+++ b/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
diff --git a/app/views/projects/runners/_group_runners.html.haml b/app/views/projects/runners/_group_runners.html.haml
index a6c16c70313..a24ada53bac 100644
--- a/app/views/projects/runners/_group_runners.html.haml
+++ b/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
diff --git a/changelogs/unreleased/gt-update-string-struture-for-group-runners.yml b/changelogs/unreleased/gt-update-string-struture-for-group-runners.yml
new file mode 100644
index 00000000000..fa06a78adae
--- /dev/null
+++ b/changelogs/unreleased/gt-update-string-struture-for-group-runners.yml
@@ -0,0 +1,5 @@
+---
+title: Update string structure for available group runners
+merge_request: 24187
+author: George Tsiolis
+type: changed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index bb7c58ae244..dd600c02496 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -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:"
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 09de983f669..6eae0be4b9f 100644
--- a/spec/features/runners_spec.rb
+++ b/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