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
Léo-Paul Géneau
gitlab-ce
Commits
d7ef517b
Commit
d7ef517b
authored
Nov 28, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds margin between tags when job is stuck
Removes extra comma from text
parent
822fa649
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
app/assets/javascripts/jobs/components/stuck_block.vue
app/assets/javascripts/jobs/components/stuck_block.vue
+6
-4
changelogs/unreleased/54571-runner-tags.yml
changelogs/unreleased/54571-runner-tags.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/assets/javascripts/jobs/components/stuck_block.vue
View file @
d7ef517b
...
...
@@ -28,20 +28,22 @@ export default {
<div
class=
"bs-callout bs-callout-warning"
>
<p
v-if=
"tags.length"
class=
"js-stuck-with-tags append-bottom-0"
>
{{
s__
(
`This job is stuck
,
because you don't have
s__
(
`This job is stuck because you don't have
any active runners online with any of these tags assigned to them:`
)
}}
<span
v-for=
"(tag, index) in tags"
:key=
"index"
class=
"badge badge-primary"
>
{{
tag
}}
</span>
<span
v-for=
"(tag, index) in tags"
:key=
"index"
class=
"badge badge-primary append-right-4"
>
{{
tag
}}
</span>
</p>
<p
v-else-if=
"hasNoRunnersForProject"
class=
"js-stuck-no-runners append-bottom-0"
>
{{
s__
(
`Job|This job is stuck
,
because the project
s__
(
`Job|This job is stuck because the project
doesn't have any runners online assigned to it.`
)
}}
</p>
<p
v-else
class=
"js-stuck-no-active-runner append-bottom-0"
>
{{
s__
(
`This job is stuck
,
because you don't
s__
(
`This job is stuck because you don't
have any active runners that can run this job.`
)
}}
</p>
...
...
changelogs/unreleased/54571-runner-tags.yml
0 → 100644
View file @
d7ef517b
---
title
:
Adds margins between tags when a job is stuck
merge_request
:
author
:
type
:
fixed
locale/gitlab.pot
View file @
d7ef517b
...
...
@@ -3640,7 +3640,7 @@ msgstr ""
msgid "Job|The artifacts will be removed in"
msgstr ""
msgid "Job|This job is stuck
,
because the project doesn't have any runners online assigned to it."
msgid "Job|This job is stuck because the project doesn't have any runners online assigned to it."
msgstr ""
msgid "Jul"
...
...
@@ -6512,10 +6512,10 @@ msgstr ""
msgid "This job is in pending state and is waiting to be picked by a runner"
msgstr ""
msgid "This job is stuck
,
because you don't have any active runners online with any of these tags assigned to them:"
msgid "This job is stuck because you don't have any active runners online with any of these tags assigned to them:"
msgstr ""
msgid "This job is stuck
,
because you don't have any active runners that can run this job."
msgid "This job is stuck because you don't have any active runners that can run this job."
msgstr ""
msgid "This job is the most recent deployment to %{link}."
...
...
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