summaryrefslogtreecommitdiff
path: root/app/models/notification_setting.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-09-14 19:34:24 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-09-14 19:34:24 +0800
commit1404aa8677969a03ed56e8f8350257f317f576d8 (patch)
tree9c6f2170641c0d4485dc6459728267a97fce8a5c /app/models/notification_setting.rb
parent9d9c2d314c10347da4a0929db429c2c2bc24a64d (diff)
downloadgitlab-ce-1404aa8677969a03ed56e8f8350257f317f576d8.tar.gz
Split notification integration into another branch
Diffstat (limited to 'app/models/notification_setting.rb')
-rw-r--r--app/models/notification_setting.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 43fc218de2b..121b598b8f3 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -32,9 +32,7 @@ class NotificationSetting < ActiveRecord::Base
:reopen_merge_request,
:close_merge_request,
:reassign_merge_request,
- :merge_merge_request,
- :failed_pipeline,
- :success_pipeline
+ :merge_merge_request
]
store :events, accessors: EMAIL_EVENTS, coder: JSON