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

human_merge_status replaced by human_merge_status_name

Browse source
This commit is contained in:
Andrew8xx8 2013-02-20 17:45:29 +04:00
parent 52e0df5c23
commit 6d68923edc
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@
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}"
});
});