merge master into issue_3359_3

1 files changed, 6 insertions, 8 deletions

diff --git a/app/controllers/notification_settings_controller.rb b/app/controllers/notification_settings_controller.rb
index aacbefd4ab8..8ec4bb1233f 100644
--- a/app/controllers/notification_settings_controller.rb
+++ b/app/controllers/notification_settings_controller.rb
@@ -2,8 +2,6 @@ class NotificationSettingsController < ApplicationController
   before_action :authenticate_user!
 
   def create
-    resource = find_resource
-
     return render_404 unless can_read?(resource)
 
     @notification_setting = current_user.notification_settings_for(resource)
@@ -21,12 +19,12 @@ class NotificationSettingsController < ApplicationController
 
   private
 
-  def find_resource
-    resource =
-      if params[:project].present?
-        Project.find(params[:project][:id])
-      elsif params[:namespace].present?
-        Group.find(params[:namespace][:id])
+  def resource
+    @resource ||=
+      if params[:project_id].present?
+        Project.find(params[:project_id])
+      elsif params[:namespace_id].present?
+        Group.find(params[:namespace_id])
       end
   end