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/controllers/merge_requests_controller.rb
View file

@ -73,7 +73,7 @@ class MergeRequestsController < ProjectResourceController
if @merge_request.unchecked?
@merge_request.check_if_can_be_merged
end
render json: {merge_status: @merge_request.human_merge_status}
render json: {merge_status: @merge_request.human_merge_status_name}
rescue Gitlab::SatelliteNotExistError
render json: {merge_status: :no_satellite}
end