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
eb238ec1
Commit
eb238ec1
authored
Oct 01, 2018
by
Shinya Maeda
Committed by
Alessio Caiazza
Oct 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix scheduled icon for stages
parent
533f5ca4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
app/assets/stylesheets/framework/icons.scss
app/assets/stylesheets/framework/icons.scss
+1
-0
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+6
-1
No files found.
app/assets/stylesheets/framework/icons.scss
View file @
eb238ec1
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
}
}
}
}
.ci-status-icon-scheduled
,
.ci-status-icon-manual
{
.ci-status-icon-manual
{
svg
{
svg
{
fill
:
$gl-text-color
;
fill
:
$gl-text-color
;
...
...
app/helpers/ci_status_helper.rb
View file @
eb238ec1
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
#
#
# See 'detailed_status?` method and `Gitlab::Ci::Status` module.
# See 'detailed_status?` method and `Gitlab::Ci::Status` module.
#
#
# TODO: DO I need to update this deprecated module?
module
CiStatusHelper
module
CiStatusHelper
def
ci_label_for_status
(
status
)
def
ci_label_for_status
(
status
)
if
detailed_status?
(
status
)
if
detailed_status?
(
status
)
...
@@ -21,6 +20,8 @@ module CiStatusHelper
...
@@ -21,6 +20,8 @@ module CiStatusHelper
'passed with warnings'
'passed with warnings'
when
'manual'
when
'manual'
'waiting for manual action'
'waiting for manual action'
when
'scheduled'
'waiting for delayed job'
else
else
status
status
end
end
...
@@ -40,6 +41,8 @@ module CiStatusHelper
...
@@ -40,6 +41,8 @@ module CiStatusHelper
s_
(
'CiStatusText|passed'
)
s_
(
'CiStatusText|passed'
)
when
'manual'
when
'manual'
s_
(
'CiStatusText|blocked'
)
s_
(
'CiStatusText|blocked'
)
when
'scheduled'
s_
(
'CiStatusText|scheduled'
)
else
else
# All states are already being translated inside the detailed statuses:
# All states are already being translated inside the detailed statuses:
# :running => Gitlab::Ci::Status::Running
# :running => Gitlab::Ci::Status::Running
...
@@ -84,6 +87,8 @@ module CiStatusHelper
...
@@ -84,6 +87,8 @@ module CiStatusHelper
'status_skipped'
'status_skipped'
when
'manual'
when
'manual'
'status_manual'
'status_manual'
when
'scheduled'
'status_scheduled'
else
else
'status_canceled'
'status_canceled'
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