Commit 16011886 authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Move error check to pvt

parent 7a8a5fe5
......@@ -8,10 +8,6 @@ class MergeBaseService < MergeRequests::BaseService
attr_reader :merge_request
# Overridden in EE.
def error_check!
end
# Overridden in EE.
def hooks_validation_pass?(_merge_request)
true
......@@ -19,6 +15,7 @@ def hooks_validation_pass?(_merge_request)
# Overridden in EE.
def hooks_validation_error(_merge_request)
# No-op
end
def source
......@@ -31,6 +28,11 @@ def source
private
# Overridden in EE.
def error_check!
# No-op
end
def raise_error(message)
raise MergeError, message
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment