Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
29acc3b4
Commit
29acc3b4
authored
Jan 09, 2019
by
George Tsiolis
Committed by
Fatih Acet
Jan 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update string structure for group runners
parent
928d974a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
app/views/groups/runners/_group_runners.html.haml
app/views/groups/runners/_group_runners.html.haml
+1
-1
app/views/projects/runners/_group_runners.html.haml
app/views/projects/runners/_group_runners.html.haml
+1
-1
changelogs/unreleased/gt-update-string-struture-for-group-runners.yml
...nreleased/gt-update-string-struture-for-group-runners.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+1
-4
spec/features/runners_spec.rb
spec/features/runners_spec.rb
+2
-2
No files found.
app/views/groups/runners/_group_runners.html.haml
View file @
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
app/views/projects/runners/_group_runners.html.haml
View file @
29acc3b4
...
@@ -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
changelogs/unreleased/gt-update-string-struture-for-group-runners.yml
0 → 100644
View file @
29acc3b4
---
title
:
Update string structure for available group runners
merge_request
:
24187
author
:
George Tsiolis
type
:
changed
locale/gitlab.pot
View file @
29acc3b4
...
@@ -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:"
...
...
spec/features/runners_spec.rb
View file @
29acc3b4
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment