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
2a1d701b
Commit
2a1d701b
authored
Nov 03, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new icon for skipped builds; show created state in mini graph
parent
651bdd7c
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
4 deletions
+21
-4
CHANGELOG.md
CHANGELOG.md
+2
-0
app/assets/stylesheets/pages/icons.scss
app/assets/stylesheets/pages/icons.scss
+12
-0
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+3
-1
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
app/views/shared/icons/_icon_status_canceled.svg
app/views/shared/icons/_icon_status_canceled.svg
+1
-1
app/views/shared/icons/_icon_status_created.svg
app/views/shared/icons/_icon_status_created.svg
+1
-1
app/views/shared/icons/_icon_status_skipped.svg
app/views/shared/icons/_icon_status_skipped.svg
+1
-0
No files found.
CHANGELOG.md
View file @
2a1d701b
...
@@ -45,6 +45,8 @@ entry.
...
@@ -45,6 +45,8 @@ entry.
-
New issue board list dropdown stays open after adding a new list
-
New issue board list dropdown stays open after adding a new list
-
Fix: Backup restore doesn't clear cache
-
Fix: Backup restore doesn't clear cache
-
Optimize Event queries by removing default order
-
Optimize Event queries by removing default order
-
Add new icon for skipped builds
-
Show created icon in pipeline mini-graph
-
Remove duplicate links from sidebar
-
Remove duplicate links from sidebar
-
API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh)
-
API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh)
-
Add Rake task to create/repair GitLab Shell hooks symlinks !5634
-
Add Rake task to create/repair GitLab Shell hooks symlinks !5634
...
...
app/assets/stylesheets/pages/icons.scss
0 → 100644
View file @
2a1d701b
// CI icon colors
.ci-status-icon
{
&
-created
g
{
fill
:
$gray-darkest
;
}
&
-skipped
g
,
&
-canceled
g
{
fill
:
$gl-text-color
;
}
}
app/helpers/ci_status_helper.rb
View file @
2a1d701b
...
@@ -47,8 +47,10 @@ module CiStatusHelper
...
@@ -47,8 +47,10 @@ module CiStatusHelper
'icon_play'
'icon_play'
when
'created'
when
'created'
'icon_status_created'
'icon_status_created'
when
'skipped'
'icon_status_skipped'
else
else
'icon_status_cancel'
'icon_status_cancel
ed
'
end
end
custom_icon
(
icon_name
)
custom_icon
(
icon_name
)
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
2a1d701b
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
-
else
-
else
Cant find HEAD commit for this branch
Cant find HEAD commit for this branch
-
stages_status
=
pipeline
.
statuses
.
relevant
.
latest
.
stages_status
-
stages_status
=
pipeline
.
statuses
.
latest
.
stages_status
%td
.stage-cell
%td
.stage-cell
-
stages
.
each
do
|
stage
|
-
stages
.
each
do
|
stage
|
-
status
=
stages_status
[
stage
]
-
status
=
stages_status
[
stage
]
...
...
app/views/shared/icons/_icon_status_cancel.svg
→
app/views/shared/icons/_icon_status_cancel
ed
.svg
View file @
2a1d701b
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
>
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
class=
"ci-status-icon-canceled"
viewBox=
"0 0 14 14"
>
<g
fill=
"#5C5C5C"
fill-rule=
"evenodd"
>
<g
fill=
"#5C5C5C"
fill-rule=
"evenodd"
>
<path
d=
"M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"
/>
<path
d=
"M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"
/>
<rect
width=
"8"
height=
"2"
x=
"3"
y=
"6"
transform=
"rotate(45 7 7)"
rx=
".5"
/>
<rect
width=
"8"
height=
"2"
x=
"3"
y=
"6"
transform=
"rotate(45 7 7)"
rx=
".5"
/>
...
...
app/views/shared/icons/_icon_status_created.svg
View file @
2a1d701b
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
enable-background=
"new 0 0 14 14"
><path
d=
"M12.5,7 C12.5,4 10,1.5 7,1.5 C4,1.5 1.5,4 1.5,7 C1.5,10 4,12.5 7,12.5 C10,12.5 12.5,10 12.5,7 L12.5,7 Z M0,7 C0,3.1 3.1,0 7,0 C10.9,0 14,3.1 14,7 C14,10.9 10.9,14 7,14 C3.1,14 0,10.9 0,7 L0,7 Z"
/><circle
cx=
"7"
cy=
"7"
r=
"3.25"
/></svg>
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
class=
"ci-status-icon-created"
viewBox=
"0 0 14 14"
enable-background=
"new 0 0 14 14"
><path
d=
"M12.5,7 C12.5,4 10,1.5 7,1.5 C4,1.5 1.5,4 1.5,7 C1.5,10 4,12.5 7,12.5 C10,12.5 12.5,10 12.5,7 L12.5,7 Z M0,7 C0,3.1 3.1,0 7,0 C10.9,0 14,3.1 14,7 C14,10.9 10.9,14 7,14 C3.1,14 0,10.9 0,7 L0,7 Z"
/><circle
cx=
"7"
cy=
"7"
r=
"3.25"
/></svg>
app/views/shared/icons/_icon_status_skipped.svg
0 → 100644
View file @
2a1d701b
<svg
width=
"20"
height=
"20"
class=
"ci-status-icon-skipped"
viewBox=
"0 0 20 20"
xmlns=
"http://www.w3.org/2000/svg"
><title>
Group Copy 31
</title><g
fill=
"#5C5C5C"
fill-rule=
"evenodd"
><path
d=
"M10 17.857c4.286 0 7.857-3.571 7.857-7.857S14.286 2.143 10 2.143 2.143 5.714 2.143 10 5.714 17.857 10 17.857M10 0c5.571 0 10 4.429 10 10s-4.429 10-10 10S0 15.571 0 10 4.429 0 10 0"
/><path
d=
"M10.986 11l-1.293 1.293a1 1 0 0 0 1.414 1.414l2.644-2.644a1.505 1.505 0 0 0 0-2.126l-2.644-2.644a1 1 0 0 0-1.414 1.414L10.986 9H6.4a1 1 0 0 0 0 2h4.586z"
/></g></svg>
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