diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-02-13 00:57:57 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-02-25 16:41:03 +0300 |
| commit | 16011886be00247d98c49e1727867767085e4398 (patch) | |
| tree | 9fbe556f443cbf286bcc7c8428aa4209fef6638d /app/services/merge_requests | |
| parent | 7a8a5fe541c617ef62aa7afac90b60440d9fddcc (diff) | |
Move error check to pvt
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/merge_base_service.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/services/merge_requests/merge_base_service.rb b/app/services/merge_requests/merge_base_service.rb index 9bf421466c7..095bdca5472 100644 --- a/app/services/merge_requests/merge_base_service.rb +++ b/app/services/merge_requests/merge_base_service.rb @@ -9,16 +9,13 @@ module MergeRequests attr_reader :merge_request # Overridden in EE. - def error_check! - end - - # Overridden in EE. def hooks_validation_pass?(_merge_request) true end # Overridden in EE. def hooks_validation_error(_merge_request) + # No-op end def source @@ -31,6 +28,11 @@ module MergeRequests private + # Overridden in EE. + def error_check! + # No-op + end + def raise_error(message) raise MergeError, message end |