diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /app/services/auto_merge_service.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/services/auto_merge_service.rb')
| -rw-r--r-- | app/services/auto_merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/auto_merge_service.rb b/app/services/auto_merge_service.rb index c5cbcc7c93b..912248d3a06 100644 --- a/app/services/auto_merge_service.rb +++ b/app/services/auto_merge_service.rb @@ -74,4 +74,4 @@ class AutoMergeService < BaseService end end -AutoMergeService.prepend_if_ee('EE::AutoMergeService') +AutoMergeService.prepend_mod_with('AutoMergeService') |