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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
10ea3b9c
Commit
10ea3b9c
authored
Dec 02, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-circle in runners helper
parent
ea5c4741
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
12 deletions
+25
-12
app/assets/stylesheets/pages/runners.scss
app/assets/stylesheets/pages/runners.scss
+10
-8
app/helpers/ci/runners_helper.rb
app/helpers/ci/runners_helper.rb
+4
-4
changelogs/unreleased/mw-replace-fa-circle-in-runners-helper.yml
...ogs/unreleased/mw-replace-fa-circle-in-runners-helper.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-0
No files found.
app/assets/stylesheets/pages/runners.scss
View file @
10ea3b9c
...
@@ -12,16 +12,18 @@
...
@@ -12,16 +12,18 @@
}
}
}
}
.runner-status-online
{
.runner-status
{
color
:
$green-600
;
&
.runner-status-online
{
}
background-color
:
$green-600
;
}
.runner-status-offline
{
&
.runner-status-offline
{
color
:
$gray-darkest
;
background-
color
:
$gray-darkest
;
}
}
.runner-status-paused
{
&
.runner-status-paused
{
color
:
$red-500
;
background-color
:
$red-500
;
}
}
}
.runner
{
.runner
{
...
...
app/helpers/ci/runners_helper.rb
View file @
10ea3b9c
...
@@ -8,14 +8,14 @@ module Ci
...
@@ -8,14 +8,14 @@ module Ci
status
=
runner
.
status
status
=
runner
.
status
case
status
case
status
when
:not_connected
when
:not_connected
content_tag
(
:span
,
title:
"New runner. Has not connected yet"
)
do
content_tag
(
:span
,
title:
_
(
"New runner. Has not connected yet"
)
)
do
sprite_icon
(
"warning-solid"
,
size:
24
,
css_class:
"gl-vertical-align-bottom!"
)
sprite_icon
(
"warning-solid"
,
size:
24
,
css_class:
"gl-vertical-align-bottom!"
)
end
end
when
:online
,
:offline
,
:paused
when
:online
,
:offline
,
:paused
content_tag
:
i
,
nil
,
content_tag
:
span
,
nil
,
class:
"
fa fa-circle
runner-status-
#{
status
}
"
,
class:
"
gl-display-inline-block gl-avatar gl-avatar-s16 gl-avatar-circle runner-status
runner-status-
#{
status
}
"
,
title:
"Runner is
#{
status
}
, last contact was
#{
time_ago_in_words
(
runner
.
contacted_at
)
}
ago"
title:
_
(
"Runner is %{status}, last contact was %{runner_contact} ago"
)
%
{
status:
status
,
runner_contact:
time_ago_in_words
(
runner
.
contacted_at
)
}
end
end
end
end
...
...
changelogs/unreleased/mw-replace-fa-circle-in-runners-helper.yml
0 → 100644
View file @
10ea3b9c
---
title
:
Replace fa-cirlce in runners helper
merge_request
:
48981
author
:
type
:
changed
locale/gitlab.pot
View file @
10ea3b9c
...
@@ -18406,6 +18406,9 @@ msgstr ""
...
@@ -18406,6 +18406,9 @@ msgstr ""
msgid "New response for issue #%{issue_iid}:"
msgid "New response for issue #%{issue_iid}:"
msgstr ""
msgstr ""
msgid "New runner. Has not connected yet"
msgstr ""
msgid "New runners registration token has been generated!"
msgid "New runners registration token has been generated!"
msgstr ""
msgstr ""
...
@@ -23499,6 +23502,9 @@ msgstr ""
...
@@ -23499,6 +23502,9 @@ msgstr ""
msgid "Runner cannot be assigned to other projects"
msgid "Runner cannot be assigned to other projects"
msgstr ""
msgstr ""
msgid "Runner is %{status}, last contact was %{runner_contact} ago"
msgstr ""
msgid "Runner runs jobs from all unassigned projects"
msgid "Runner runs jobs from all unassigned projects"
msgstr ""
msgstr ""
...
...
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