diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-21 00:08:23 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-21 00:08:23 +0000 |
| commit | 9aab0f097302a0011130002633fd651d4aa39b94 (patch) | |
| tree | 32deab4c608699e7225c4a5fabec4d57a8a8bae0 | |
| parent | 535252005e1384e9c6f3d55cba04cb493e58de24 (diff) | |
| parent | ce8dd3bd660e18c1a143c24539418c8697fe29b9 (diff) | |
| download | gitlab-ce-9aab0f097302a0011130002633fd651d4aa39b94.tar.gz | |
Merge branch 'merge-immediately-button-color-fix' into 'master'
Fixed issue with merge button color
Closes #17644
See merge request !4211
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index f58647988a2..b6d590f681c 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -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) |