diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-01 03:10:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-01 03:10:35 +0300 |
| commit | 57ac0bc8f74b1e21cdc58607e217b79d307e1e40 (patch) | |
| tree | d7fa9e0f79573748e7484d9f36c91325d499473d /app/services/auto_merge | |
| parent | 7942fe679107b5e73e0b359f000946dbbf2feb35 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/auto_merge')
| -rw-r--r-- | app/services/auto_merge/merge_when_pipeline_succeeds_service.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb b/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb index 7e0298432ac..d18f2935d92 100644 --- a/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb +++ b/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb @@ -38,8 +38,6 @@ module AutoMerge private def notify(merge_request) - return unless Feature.enabled?(:mwps_notification, project) - notification_service.async.merge_when_pipeline_succeeds(merge_request, current_user) if merge_request.saved_change_to_auto_merge_enabled? end end |