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
af93d447
Commit
af93d447
authored
Jun 23, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Explicit error when commit not found in the GitLab CI
parent
88343897
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+2
-2
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+6
-0
No files found.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
af93d447
...
@@ -36,11 +36,11 @@ class @MergeRequestWidget
...
@@ -36,11 +36,11 @@ class @MergeRequestWidget
showCiState
:
(
state
)
->
showCiState
:
(
state
)
->
$
(
'.ci_widget'
).
hide
()
$
(
'.ci_widget'
).
hide
()
allowed_states
=
[
"failed"
,
"canceled"
,
"running"
,
"pending"
,
"success"
]
allowed_states
=
[
"failed"
,
"canceled"
,
"running"
,
"pending"
,
"success"
,
"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
when
"failed"
,
"canceled"
when
"failed"
,
"canceled"
,
"not_found"
@
setMergeButtonClass
(
'btn-danger'
)
@
setMergeButtonClass
(
'btn-danger'
)
when
"running"
,
"pending"
when
"running"
,
"pending"
@
setMergeButtonClass
(
'btn-warning'
)
@
setMergeButtonClass
(
'btn-warning'
)
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
af93d447
...
@@ -23,6 +23,12 @@
...
@@ -23,6 +23,12 @@
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
Checking for CI status for
#{
@merge_request
.
last_commit_short_sha
}
Checking for CI status for
#{
@merge_request
.
last_commit_short_sha
}
.ci_widget.ci-not_found
{
style:
"display:none"
}
=
icon
(
"times"
)
%span
Can not find commit in the CI server
for
#{
@merge_request
.
last_commit_short_sha
}
.
.ci_widget.ci-canceled
{
style:
"display:none"
}
.ci_widget.ci-canceled
{
style:
"display:none"
}
=
icon
(
"times"
)
=
icon
(
"times"
)
%span
CI build canceled
%span
CI build canceled
...
...
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