summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-29 13:52:42 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-30 10:44:20 +0200
commit71e7b398431506c8bac2e8e6014b0f3891a41f95 (patch)
tree31d30ecd7d71de5614cc79e5213789cb3c5f7539 /app/controllers
parent630c86a7a36cee36ed6b9c93644a6cb51e2b3b23 (diff)
downloadgitlab-ce-71e7b398431506c8bac2e8e6014b0f3891a41f95.tar.gz
Refactor creating notification setting with defaults
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects_controller.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 77122f59128..e2dc6309d26 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -102,12 +102,7 @@ class ProjectsController < Projects::ApplicationController
@membership = @project.team.find_member(current_user.id)
if @membership
- @notification_setting = current_user.notification_settings.find_or_initialize_by(source: @project)
-
- unless @notification_setting.persisted?
- @notification_setting.set_defaults
- @notification_setting.save
- end
+ @notification_setting = current_user.notification_settings.find_or_create_for(@project)
end
end