Fix merge state detection

2013-02-21 09:25:07 +02:00 · 2013-02-21 09:25:07 +02:00 · 585259b837
parent ba1a453ef3
commit 585259b837
1 changed files with 1 additions and 1 deletions
--- 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