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

@ -73,9 +73,9 @@ class MergeRequestsController < ProjectResourceController
if @merge_request.unchecked?
@merge_request.check_if_can_be_merged
end
render json: {state: @merge_request.human_state}
render json: {merge_status: @merge_request.human_merge_status}
rescue Gitlab::SatelliteNotExistError
render json: {state: :no_satellite}
render json: {merge_status: :no_satellite}
end
def automerge