diff options
| author | Martin Hanzel <mhanzel@gitlab.com> | 2019-06-05 10:18:12 +0200 |
|---|---|---|
| committer | Martin Hanzel <mhanzel@gitlab.com> | 2019-06-05 10:18:12 +0200 |
| commit | 03c72e998dd8016ccda0a6b9515dd3fc0302978a (patch) | |
| tree | 1f7e1623637de75c2807ef7d40f0feae08c687f3 /app/services/notification_service.rb | |
| parent | 3aeea7fb0c1d6389df6d8643ef40dd54aa84d1a8 (diff) | |
| parent | b560ce1e666733f12c65e8b9f659c89256c1775b (diff) | |
| download | gitlab-ce-mh/notes-spec.tar.gz | |
Merge branch 'master' into mh/notes-specmh/notes-spec
Diffstat (limited to 'app/services/notification_service.rb')
| -rw-r--r-- | app/services/notification_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index f797c0f11c6..5aa804666f0 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -238,7 +238,7 @@ class NotificationService merge_request, current_user, :merged_merge_request_email, - skip_current_user: !merge_request.merge_when_pipeline_succeeds? + skip_current_user: !merge_request.auto_merge_enabled? ) end |