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
1e45fb2f
Commit
1e45fb2f
authored
May 25, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with button color when no CI enabled
Closes #17844
parent
4618e538
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+2
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-2
No files found.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
1e45fb2f
...
@@ -106,6 +106,7 @@ class @MergeRequestWidget
...
@@ -106,6 +106,7 @@ class @MergeRequestWidget
@
firstCICheck
=
false
@
firstCICheck
=
false
showCIStatus
:
(
state
)
->
showCIStatus
:
(
state
)
->
return
if
not
state
?
$
(
'.ci_widget'
).
hide
()
$
(
'.ci_widget'
).
hide
()
allowed_states
=
[
"failed"
,
"canceled"
,
"running"
,
"pending"
,
"success"
,
"skipped"
,
"not_found"
]
allowed_states
=
[
"failed"
,
"canceled"
,
"running"
,
"pending"
,
"success"
,
"skipped"
,
"not_found"
]
if
state
in
allowed_states
if
state
in
allowed_states
...
@@ -126,6 +127,6 @@ class @MergeRequestWidget
...
@@ -126,6 +127,6 @@ class @MergeRequestWidget
$
(
'.ci_widget:visible .ci-coverage'
).
text
(
text
)
$
(
'.ci_widget:visible .ci-coverage'
).
text
(
text
)
setMergeButtonClass
:
(
css_class
)
->
setMergeButtonClass
:
(
css_class
)
->
$
(
'.js-merge-button'
)
$
(
'.js-merge-button
,.accept-action .dropdown-toggle
'
)
.
removeClass
(
'btn-danger btn-warning btn-create'
)
.
removeClass
(
'btn-danger btn-warning btn-create'
)
.
addClass
(
css_class
)
.
addClass
(
css_class
)
app/controllers/projects/merge_requests_controller.rb
View file @
1e45fb2f
...
@@ -229,6 +229,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -229,6 +229,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
if
ci_commit
if
ci_commit
status
=
ci_commit
.
status
status
=
ci_commit
.
status
coverage
=
ci_commit
.
try
(
:coverage
)
coverage
=
ci_commit
.
try
(
:coverage
)
status
||=
"preparing"
else
else
ci_service
=
@merge_request
.
source_project
.
ci_service
ci_service
=
@merge_request
.
source_project
.
ci_service
status
=
ci_service
.
commit_status
(
merge_request
.
last_commit
.
sha
,
merge_request
.
source_branch
)
if
ci_service
status
=
ci_service
.
commit_status
(
merge_request
.
last_commit
.
sha
,
merge_request
.
source_branch
)
if
ci_service
...
@@ -238,8 +240,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -238,8 +240,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
end
end
status
=
"preparing"
if
status
.
nil?
response
=
{
response
=
{
title:
merge_request
.
title
,
title:
merge_request
.
title
,
sha:
merge_request
.
last_commit_short_sha
,
sha:
merge_request
.
last_commit_short_sha
,
...
...
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