merges activities into notifications

2016-01-06 12:33:37 +01:00
parent 7a8ffe2d4a
commit b5e9113718
14 changed files with 83 additions and 67 deletions
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -3,8 +3,7 @@ class NotificationsController < ApplicationController
  load_and_authorize_resource class: "User"

  def index
-    @notifications = current_user.notifications.unread.recent.for_render
-    @notifications.each { |notification| notification.mark_as_read! }
+    @notifications = current_user.notifications.recent.for_render
  end

 end