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

State renamed to merge_status

Browse source
This commit is contained in:
Andrew8xx8 2013-02-15 12:27:13 +04:00
parent 26d4574ada
commit 8db3920c01
5 changed files with 19 additions and 14 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.state == MergeRequest::UNCHECKED ? "true" : "false"},
check_enable: #{@merge_request.merge_status == MergeRequest::UNCHECKED ? "true" : "false"},
url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
current_state: "#{@merge_request.human_state}",
current_status: "#{@merge_request.human_merge_status}",
action: "#{controller.action_name}"
});
});