diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
| commit | ed490b781f9347b77eb2305e33ba6dd83f3539b0 (patch) | |
| tree | 4f958ce8da072e35ef654cf5ae0a152f613f3ad8 /app/models/notification.rb | |
| parent | a817f084eafaf5527445c29ab1d68f42b1a2872f (diff) | |
| parent | 50529cbceb84e611bca497624a7a4c38113e5135 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock config/application.rb
Diffstat (limited to 'app/models/notification.rb')
| -rw-r--r-- | app/models/notification.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/notification.rb b/app/models/notification.rb index be9964087..0b0f01aa8 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -81,8 +81,6 @@ class Notification < ApplicationRecord end end - private - def activity_types_from_types(types) types.map { |type| TYPE_CLASS_MAP[type.to_sym] }.compact end |