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

[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 9ecd22b456493dde5e2efcca96df383fb63e9d3d..a3a13b926e2482e7a9bf7f918228579e938a30d2 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -1,8 +1,6 @@
 module Api
-  class ChangesetCommentsController < ApplicationController
-    skip_before_action :verify_authenticity_token
+  class ChangesetCommentsController < ApiController
     before_action :authorize
-    before_action :api_deny_access_handler
 
     authorize_resource
 
@@ -34,7 +32,7 @@ module Api
 
       # 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
@@ -42,7 +40,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
-      render "changesets/changeset"
+      render "api/changesets/changeset"
     end
 
     ##
@@ -62,7 +60,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
-      render "changesets/changeset"
+      render "api/changesets/changeset"
     end
 
     ##
@@ -82,7 +80,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
-      render "changesets/changeset"
+      render "api/changesets/changeset"
     end
   end
 end