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
Tatuya Kamada
gitlab-ce
Commits
ce8dd3bd
Commit
ce8dd3bd
authored
8 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with merge button color
Closes #17644
parent
f26389a0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+2
-2
No files found.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
ce8dd3bd
...
...
@@ -113,7 +113,7 @@ class @MergeRequestWidget
switch
state
when
"failed"
,
"canceled"
,
"not_found"
@
setMergeButtonClass
(
'btn-danger'
)
when
"running"
,
"pending"
when
"running"
@
setMergeButtonClass
(
'btn-warning'
)
when
"success"
@
setMergeButtonClass
(
'btn-create'
)
...
...
@@ -126,6 +126,6 @@ class @MergeRequestWidget
$
(
'.ci_widget:visible .ci-coverage'
).
text
(
text
)
setMergeButtonClass
:
(
css_class
)
->
$
(
'.
accept_merge_request
'
)
$
(
'.
js-merge-button
'
)
.
removeClass
(
'btn-danger btn-warning btn-create'
)
.
addClass
(
css_class
)
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