summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-29 13:37:43 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-30 10:44:20 +0200
commit86418c475be1b2a37e89682bc87055b7372bbcfb (patch)
tree4e4b092269cc3919ae72184414a07c63b03effc4 /app/models
parent08b3d7f6ef23b7a8a83c7e71e2d04f6416e73406 (diff)
downloadgitlab-ce-86418c475be1b2a37e89682bc87055b7372bbcfb.tar.gz
Remove useless Notification model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models')
-rw-r--r--app/models/member.rb4
-rw-r--r--app/models/notification.rb13
-rw-r--r--app/models/user.rb4
3 files changed, 2 insertions, 19 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index 799f28c3fdf..cbcc54c0250 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -171,8 +171,8 @@ class Member < ActiveRecord::Base
end
end
- def notification
- @notification ||= user.notification_settings.find_by(source: source)
+ def notification_setting
+ @notification_setting ||= user.notification_settings.find_by(source: source)
end
private
diff --git a/app/models/notification.rb b/app/models/notification.rb
deleted file mode 100644
index 3805bde88b0..00000000000
--- a/app/models/notification.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Notification
- attr_accessor :target
-
- delegate :disabled?, :participating?, :watch?, :global?, :mention?, to: :target
-
- def initialize(target)
- @target = target
- end
-
- def level
- target.notification_level
- end
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index f556dc5903d..af6b86bfa70 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -357,10 +357,6 @@ class User < ActiveRecord::Base
"#{self.class.reference_prefix}#{username}"
end
- def notification
- @notification ||= Notification.new(self)
- end
-
def generate_password
if self.force_random_password
self.password = self.password_confirmation = Devise.friendly_token.first(8)