Extend error checking to be overwritten in EE
This commit is contained in:
parent
4e16edbe0a
commit
7a8a5fe541
|
@ -8,6 +8,10 @@ module MergeRequests
|
|||
|
||||
attr_reader :merge_request
|
||||
|
||||
# Overridden in EE.
|
||||
def error_check!
|
||||
end
|
||||
|
||||
# Overridden in EE.
|
||||
def hooks_validation_pass?(_merge_request)
|
||||
true
|
||||
|
|
|
@ -46,6 +46,8 @@ module MergeRequests
|
|||
end
|
||||
|
||||
def error_check!
|
||||
super
|
||||
|
||||
error =
|
||||
if @merge_request.should_be_rebased?
|
||||
'Only fast-forward merge is allowed for your project. Please update your source branch'
|
||||
|
|
|
@ -33,6 +33,8 @@ module MergeRequests
|
|||
end
|
||||
|
||||
def error_check!
|
||||
super
|
||||
|
||||
error =
|
||||
if Feature.disabled?(:merge_to_tmp_merge_ref_path, project)
|
||||
'Feature is not enabled'
|
||||
|
|
Loading…
Reference in New Issue