Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAndrew8xx8 <avk@8xx8.ru>2013-02-19 12:57:09 +0400
committerAndrew8xx8 <avk@8xx8.ru>2013-02-19 12:57:09 +0400
commit6e333d507565a63037e9f4142a29138efa530971 (patch)
treea0119c12965f112ac62ccd6f5853a6d6063aa630 /app
parentd58eb62d681b4316daa5eaeff37997ff5750dccf (diff)
Javascript widget fixed
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/merge_requests.js.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee
index 65ed817c7c6..496da7316fd 100644
--- a/app/assets/javascripts/merge_requests.js.coffee
+++ b/app/assets/javascripts/merge_requests.js.coffee
@@ -27,7 +27,7 @@ class MergeRequest
this.$el.find(selector)
initMergeWidget: ->
- this.showState( @opts.current_state )
+ this.showState( @opts.current_status )
if this.$('.automerge_widget').length and @opts.check_enable
$.get @opts.url_to_automerge_check, (data) =>