diff options
Diffstat (limited to 'app/services/auto_merge/base_service.rb')
| -rw-r--r-- | app/services/auto_merge/base_service.rb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/app/services/auto_merge/base_service.rb b/app/services/auto_merge/base_service.rb index 2a32f0c74ac..9e49bd86ec0 100644 --- a/app/services/auto_merge/base_service.rb +++ b/app/services/auto_merge/base_service.rb @@ -63,21 +63,6 @@ module AutoMerge end end - ## - # NOTE: This method is to be removed when `disallow_to_create_merge_request_pipelines_in_target_project` - # feature flag is removed. - def self.can_add_to_merge_train?(merge_request) - if ::Feature.enabled?(:ci_disallow_to_create_merge_request_pipelines_in_target_project, merge_request.target_project) - merge_request.for_same_project? - else - true - end - end - - def can_add_to_merge_train?(merge_request) - self.class.can_add_to_merge_train?(merge_request) - end - private # Overridden in child classes |