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

app/abilities/ability.rb

@@ -16,7 +16,7 @@ class Ability
 
     if Settings.status != "database_offline"
       can [:index, :feed, :show], Changeset
-      can :index, ChangesetComment
+      can :show, ChangesetComment
       can [:confirm, :confirm_resend, :confirm_email], :confirmation
       can [:index, :rss, :show], DiaryEntry
       can :index, DiaryComment

app/controllers/changeset_comments/feeds_controller.rb

@@ -1,16 +1,16 @@
-module Feeds
-  class ChangesetCommentsController < ApplicationController
+module ChangesetComments
+  class FeedsController < ApplicationController
     before_action :authorize_web
     before_action :set_locale
 
-    authorize_resource
+    authorize_resource :changeset_comment
 
     before_action -> { check_database_readable(:need_api => true) }
     around_action :web_timeout
 
     ##
     # Get a feed of recent changeset comments
-    def index
+    def show
       if params[:changeset_id]
         # Extract the arguments
         changeset_id = params[:changeset_id].to_i