diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-28 20:31:36 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-30 10:44:20 +0200 |
| commit | b8f38437900cdddac9d19d5c48a2a8e5bb037f41 (patch) | |
| tree | 5d4f0e17619e25cea70cc447c540aa5cddafb89d /app/models/member.rb | |
| parent | 7ea1bcab45697556d4ffd79ab680872ed823d4a3 (diff) | |
| download | gitlab-ce-b8f38437900cdddac9d19d5c48a2a8e5bb037f41.tar.gz | |
Update NotificationService to use NotificationSettings instead of membership
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index 177f37c3bbd..e665ba6fb75 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -19,7 +19,6 @@ class Member < ActiveRecord::Base include Sortable - include Notifiable include Gitlab::Access attr_accessor :raw_invite_token @@ -170,6 +169,10 @@ class Member < ActiveRecord::Base end end + def notification + @notification ||= user.notification_settings.find_by(source: source) + end + private def send_invite |