Raise exception and show message to user if repo missing satellite
This commit is contained in:
parent
eaa8cd28d0
commit
eded4bfa95
3 changed files with 16 additions and 3 deletions
|
@ -69,6 +69,8 @@ class MergeRequestsController < ProjectResourceController
|
|||
@merge_request.check_if_can_be_merged
|
||||
end
|
||||
render json: {state: @merge_request.human_state}
|
||||
rescue Gitlab::SatelliteNotExistError
|
||||
render json: {state: :no_satellite}
|
||||
end
|
||||
|
||||
def automerge
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue