diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-09-14 19:42:16 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-10-17 07:24:48 +0000 |
| commit | 8ea702cfe590e94ea496609f85ba0f23bda2dcce (patch) | |
| tree | b5aef28ad58ae357b0cdce8651f76710fb69439f /app/models/notification_setting.rb | |
| parent | 7f7c3e1a8aeba5d21c332c8cacdf8af9067199c4 (diff) | |
| download | gitlab-ce-8ea702cfe590e94ea496609f85ba0f23bda2dcce.tar.gz | |
Revert "Split notification integration into another branch"
This reverts commit 1404aa8677969a03ed56e8f8350257f317f576d8.
Diffstat (limited to 'app/models/notification_setting.rb')
| -rw-r--r-- | app/models/notification_setting.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb index 121b598b8f3..43fc218de2b 100644 --- a/app/models/notification_setting.rb +++ b/app/models/notification_setting.rb @@ -32,7 +32,9 @@ class NotificationSetting < ActiveRecord::Base :reopen_merge_request, :close_merge_request, :reassign_merge_request, - :merge_merge_request + :merge_merge_request, + :failed_pipeline, + :success_pipeline ] store :events, accessors: EMAIL_EVENTS, coder: JSON |