diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/models/notification_setting.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
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) |