Skip to content

G
gitlab-ce
Commit 585259b8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Fix merge state detection

parent ba1a453e
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/assets/javascripts/merge_requests.js.coffee
View file @ 585259b8
...@@ -31,7 +31,7 @@ class MergeRequest ...@@ -31,7 +31,7 @@ class MergeRequest
if this.$('.automerge_widget').length and @opts.check_enable if this.$('.automerge_widget').length and @opts.check_enable
$.get @opts.url_to_automerge_check, (data) => $.get @opts.url_to_automerge_check, (data) =>
this.showState( data.state ) this.showState( data.merge_status )
, 'json' , 'json'
if @opts.ci_enable if @opts.ci_enable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7