diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-02-13 00:21:14 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-02-25 16:41:02 +0300 |
| commit | 7a8a5fe541c617ef62aa7afac90b60440d9fddcc (patch) | |
| tree | a044c2ab31d5a0356442637194873e5066f8794c /app/services/merge_requests | |
| parent | 4e16edbe0a26d95ea94ad61ebaadac4f7463352b (diff) | |
Extend error checking to be overwritten in EE
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/merge_base_service.rb | 4 | ||||
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/merge_to_ref_service.rb | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/app/services/merge_requests/merge_base_service.rb b/app/services/merge_requests/merge_base_service.rb index 61049f394aa..9bf421466c7 100644 --- a/app/services/merge_requests/merge_base_service.rb +++ b/app/services/merge_requests/merge_base_service.rb @@ -9,6 +9,10 @@ module MergeRequests attr_reader :merge_request # Overridden in EE. + def error_check! + end + + # Overridden in EE. def hooks_validation_pass?(_merge_request) true end diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index f5d66589196..8241e408ce5 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -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' diff --git a/app/services/merge_requests/merge_to_ref_service.rb b/app/services/merge_requests/merge_to_ref_service.rb index ed62c3424bd..586652ae44e 100644 --- a/app/services/merge_requests/merge_to_ref_service.rb +++ b/app/services/merge_requests/merge_to_ref_service.rb @@ -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' |