Merge remote-tracking branch 'upstream/pull/3194'

[rails.git] / app / controllers / api / changeset_comments_controller.rb

diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
index db90dcbe3f3c88e00916a5aca3df9eea762e3bb6..a3a13b926e2482e7a9bf7f918228579e938a30d2 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -1,7 +1,6 @@
 module Api
   class ChangesetCommentsController < ApiController
     before_action :authorize
 module Api
   class ChangesetCommentsController < ApiController
     before_action :authorize

-    before_action :api_deny_access_handler

 
     authorize_resource
 
 
     authorize_resource
 


@@ -33,7 +32,7 @@ module Api
 
       # Notify current subscribers of the new comment
       changeset.subscribers.visible.each do |user|
 
       # Notify current subscribers of the new comment
       changeset.subscribers.visible.each do |user|

-        Notifier.changeset_comment_notification(comment, user).deliver_later if current_user != user
+        UserMailer.changeset_comment_notification(comment, user).deliver_later if current_user != user

       end
 
       # Add the commenter to the subscribers if necessary
       end
 
       # Add the commenter to the subscribers if necessary