deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix merge state detection

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-21 09:25:07 +02:00
parent ba1a453ef3
commit 585259b837
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/merge_requests.js.coffee
View file

@ -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