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

State machine added for merge_status field

Browse source
This commit is contained in:
Andrew8xx8 2013-02-20 17:15:01 +04:00
parent 1b7b17d12a
commit e2d94e0719
3 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@
$(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}",