Fix merge state detection

Dmitriy Zaporozhets
1 parent ba1a453e
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
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
...	...	@@ -31,7 +31,7 @@ class MergeRequest
31	31
32	32	if this.$('.automerge_widget').length and @opts.check_enable
33	33	$.get @opts.url_to_automerge_check, (data) =>
34		- this.showState( data.state )
	34	+ this.showState( data.merge_status )
35	35	, 'json'
36	36
37	37	if @opts.ci_enable
...	...