Merge branch 'merge-immediately-button-color-fix' into 'master'

Fixed issue with merge button color ![Screen_Shot_2016-05-19_at_12.51.35](/uploads/a2768908553961e88c5a8f0e1f343078/Screen_Shot_2016-05-19_at_12.51.35.png) Closes #17644 See merge request !4211

Merge branch 'merge-immediately-button-color-fix' into 'master'
9aab0f09 · Jacob Schatz · 53525200 · ce8dd3bd · 9aab0f09
Commit 9aab0f09 authored May 21, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

merge_request_widget.js.coffee app/assets/javascripts/merge_request_widget.js.coffee +2 -2

No files found.
--- 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)