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

2
app/controllers/merge_requests_controller.rb
View file

@ -75,7 +75,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