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

Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine

Browse source 
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
This commit is contained in:
Dmitriy Zaporozhets 2013-02-19 11:01:19 +02:00
commit 155703c613
55 changed files with 521 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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