Commit 585259b8370dd50e732aac188ee7887dc1a5f4f2
1 parent
ba1a453e
Exists in
master
and in
4 other branches
Fix merge state detection
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 | @@ -31,7 +31,7 @@ class MergeRequest | ||
| 31 | 31 | ||
| 32 | if this.$('.automerge_widget').length and @opts.check_enable | 32 | if this.$('.automerge_widget').length and @opts.check_enable |
| 33 | $.get @opts.url_to_automerge_check, (data) => | 33 | $.get @opts.url_to_automerge_check, (data) => |
| 34 | - this.showState( data.state ) | 34 | + this.showState( data.merge_status ) |
| 35 | , 'json' | 35 | , 'json' |
| 36 | 36 | ||
| 37 | if @opts.ci_enable | 37 | if @opts.ci_enable |