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
|
||||
|
|
|
@ -23,6 +23,11 @@
|
|||
.clearfix
|
||||
|
||||
|
||||
.automerge_widget.no_satellite{style: "display:none"}
|
||||
.alert.alert-error
|
||||
%span
|
||||
%strong This repository does not have satellite. Ask administrator to fix this issue
|
||||
|
||||
.automerge_widget.cannot_be_merged{style: "display:none"}
|
||||
.alert.alert-info
|
||||
%span
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue