kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix few bugs related to recent notifications refactoring

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2016-03-29 14:03:23 +02:00
parent 71e7b39843
commit f8f68d6b8c
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/profiles/notifications_controller.rb
View file

@ -1,7 +1,6 @@
class Profiles::NotificationsController < Profiles::ApplicationController
def show
@user = current_user
@notification = current_user.notification
@group_notifications = current_user.notification_settings.for_groups
@project_notifications = current_user.notification_settings.for_projects
end

2
app/models/member.rb
View file

@ -163,7 +163,7 @@ class Member < ActiveRecord::Base
end
def create_notification_setting
user.notification_setting.find_or_create_for(source)
user.notification_settings.find_or_create_for(source)
end
def notification_setting