Skip to content

G
gitlab-ce
Commit 6e333d50 authored by Andrew8xx8's avatar Andrew8xx8
Browse files
Options

Javascript widget fixed

parent d58eb62d
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/assets/javascripts/merge_requests.js.coffee
View file @ 6e333d50
...@@ -27,7 +27,7 @@ class MergeRequest ...@@ -27,7 +27,7 @@ class MergeRequest
this.$el.find(selector) this.$el.find(selector)
initMergeWidget: -> initMergeWidget: ->
this.showState( @opts.current_state ) this.showState( @opts.current_status )
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) =>
......
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