summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_base_service.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/merge_requests/merge_base_service.rb')
-rw-r--r--app/services/merge_requests/merge_base_service.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/merge_requests/merge_base_service.rb b/app/services/merge_requests/merge_base_service.rb
index 4c5a0d96957..61049f394aa 100644
--- a/app/services/merge_requests/merge_base_service.rb
+++ b/app/services/merge_requests/merge_base_service.rb
@@ -27,6 +27,10 @@ module MergeRequests
private
+ def raise_error(message)
+ raise MergeError, message
+ end
+
def handle_merge_error(*args)
# No-op
end