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

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

Browse source 
Conflicts:
	app/models/merge_request.rb
This commit is contained in:
Dmitriy Zaporozhets 2013-02-26 10:38:40 +02:00
commit d7b667fee2
10 changed files with 97 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/merge_requests/_show.html.haml
View file

@ -29,10 +29,10 @@
$(function(){
merge_request = new MergeRequest({
url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
check_enable: #{@merge_request.merge_status == MergeRequest::UNCHECKED ? "true" : "false"},
check_enable: #{@merge_request.unchecked? ? "true" : "false"},
url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
current_status: "#{@merge_request.human_merge_status}",
current_status: "#{@merge_request.human_merge_status_name}",
action: "#{controller.action_name}"
});
});