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
427b5df2
Commit
427b5df2
authored
9 years ago
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for CI skipped status
parent
88a3cfe1
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
2 deletions
+14
-2
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+5
-0
app/models/project_services/ci_service.rb
app/models/project_services/ci_service.rb
+1
-1
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+6
-0
No files found.
CHANGELOG
View file @
427b5df2
...
@@ -29,6 +29,7 @@ v 7.14.0 (unreleased)
...
@@ -29,6 +29,7 @@ v 7.14.0 (unreleased)
- Disabled autocapitalize and autocorrect on login field (Daryl Chan)
- Disabled autocapitalize and autocorrect on login field (Daryl Chan)
- Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
- Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
- Remove redis-store TTL monkey patch
- Remove redis-store TTL monkey patch
- Add support for CI skipped status
v 7.13.2
v 7.13.2
- Fix randomly failed spec
- Fix randomly failed spec
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
427b5df2
...
@@ -36,7 +36,7 @@ class @MergeRequestWidget
...
@@ -36,7 +36,7 @@ class @MergeRequestWidget
showCiState
:
(
state
)
->
showCiState
:
(
state
)
->
$
(
'.ci_widget'
).
hide
()
$
(
'.ci_widget'
).
hide
()
allowed_states
=
[
"failed"
,
"canceled"
,
"running"
,
"pending"
,
"success"
,
"not_found"
]
allowed_states
=
[
"failed"
,
"canceled"
,
"running"
,
"pending"
,
"success"
,
"
skipped"
,
"
not_found"
]
if
state
in
allowed_states
if
state
in
allowed_states
$
(
'.ci_widget.ci-'
+
state
).
show
()
$
(
'.ci_widget.ci-'
+
state
).
show
()
switch
state
switch
state
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/merge_requests.scss
View file @
427b5df2
...
@@ -139,6 +139,11 @@
...
@@ -139,6 +139,11 @@
color
:
$gl-success
;
color
:
$gl-success
;
}
}
&
.ci-skipped
{
background-color
:
#eee
;
color
:
#888
;
}
&
.ci-pending
,
&
.ci-pending
,
&
.ci-running
{
&
.ci-running
{
color
:
$gl-warning
;
color
:
$gl-warning
;
...
...
This diff is collapsed.
Click to expand it.
app/models/project_services/ci_service.rb
View file @
427b5df2
...
@@ -41,7 +41,7 @@ class CiService < Service
...
@@ -41,7 +41,7 @@ class CiService < Service
# Return string with build status or :error symbol
# Return string with build status or :error symbol
#
#
# Allowed states: 'success', 'failed', 'running', 'pending'
# Allowed states: 'success', 'failed', 'running', 'pending'
, 'skipped'
#
#
#
#
# Ex.
# Ex.
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
427b5df2
...
@@ -6,6 +6,12 @@
...
@@ -6,6 +6,12 @@
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
#{
@merge_request
.
last_commit_short_sha
}
.
=
link_to
"View build page"
,
ci_build_details_path
(
@merge_request
),
:"data-no-turbolink"
=>
"data-no-turbolink"
=
link_to
"View build page"
,
ci_build_details_path
(
@merge_request
),
:"data-no-turbolink"
=>
"data-no-turbolink"
.ci_widget.ci-skipped
{
style:
"display:none"
}
=
icon
(
"check"
)
%span
CI build skipped
for
#{
@merge_request
.
last_commit_short_sha
}
.
=
link_to
"View build page"
,
ci_build_details_path
(
@merge_request
),
:"data-no-turbolink"
=>
"data-no-turbolink"
.ci_widget.ci-failed
{
style:
"display:none"
}
.ci_widget.ci-failed
{
style:
"display:none"
}
=
icon
(
"times"
)
=
icon
(
"times"
)
%span
CI build failed
%span
CI build failed
...
...
This diff is collapsed.
Click to expand it.
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