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
0025fd45
Commit
0025fd45
authored
May 10, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '25226-fix-pipeline-icons-path' into 'master'
Fix icons path and mappings See merge request !1862
parents
ed127d43
fa3ba387
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/pipelines/components/stage.js
app/assets/javascripts/pipelines/components/stage.js
+2
-2
app/assets/javascripts/pipelines/components/stage.vue
app/assets/javascripts/pipelines/components/stage.vue
+2
-2
No files found.
app/assets/javascripts/pipelines/components/stage.js
View file @
0025fd45
/* global Flash */
import
StatusIconEntityMap
from
'
../../ci_status
_icons
'
;
import
{
statusClassToSvgMap
}
from
'
../../vue_shared/pipeline_svg
_icons
'
;
export
default
{
props
:
{
...
...
@@ -76,7 +76,7 @@ export default {
return
`mini-pipeline-graph-dropdown-toggle has-tooltip js-builds-dropdown-button ci-status-icon-
${
this
.
stage
.
status
.
group
}
`
;
},
svgHTML
()
{
return
StatusIconEntity
Map
[
this
.
stage
.
status
.
icon
];
return
statusClassToSvg
Map
[
this
.
stage
.
status
.
icon
];
},
},
watch
:
{
...
...
app/assets/javascripts/pipelines/components/stage.vue
View file @
0025fd45
...
...
@@ -14,7 +14,7 @@
*/
/* global Flash */
import
StatusIconEntityMap
from
'
../../ci_status
_icons
'
;
import
{
statusClassToSvgMap
}
from
'
../../vue_shared/pipeline_svg
_icons
'
;
export
default
{
props
:
{
...
...
@@ -113,7 +113,7 @@ export default {
},
svgIcon
()
{
return
StatusIconEntity
Map
[
this
.
stage
.
status
.
icon
];
return
statusClassToSvg
Map
[
this
.
stage
.
status
.
icon
];
},
},
};
...
...
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