diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-19 15:11:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-19 15:11:06 +0300 |
| commit | 1fdc1d34e8e3cab28cd010a2b352974da9847e8e (patch) | |
| tree | a8158b1ef1a1f09ccb7d4789a3d7e519d8825b37 /app/models/notification_setting.rb | |
| parent | c44a81b8b9f4c27bec1f6df6ea25f135c390b730 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/notification_setting.rb')
| -rw-r--r-- | app/models/notification_setting.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb index 82e39e4f207..72813b17501 100644 --- a/app/models/notification_setting.rb +++ b/app/models/notification_setting.rb @@ -49,7 +49,8 @@ class NotificationSetting < ApplicationRecord :failed_pipeline, :fixed_pipeline, :success_pipeline, - :moved_project + :moved_project, + :merge_when_pipeline_succeeds ].freeze def self.email_events(source = nil) |