Fix merge state detection

585259b8 · Dmitriy Zaporozhets · ba1a453e · 585259b8
Commit 585259b8 authored Feb 21, 2013 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merge_requests.js.coffee app/assets/javascripts/merge_requests.js.coffee +1 -1

No files found.
--- a/app/assets/javascripts/merge_requests.js.coffee
+++ b/app/assets/javascripts/merge_requests.js.coffee
@@ -31,7 +31,7 @@ class MergeRequest

    if this.$('.automerge_widget').length and @opts.check_enable
      $.get @opts.url_to_automerge_check, (data) =>
-        this.showState( data.state )
+        this.showState( data.merge_status )
      , 'json'

    if @opts.ci_enable