Merge blocking branch to head.

[rails.git] / app / controllers / user_blocks_controller.rb

diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index f6bca4bced9f870c89b7db7bb3b19bd2bbd1114a..fd9f03c4a9c4315d614dbd1a0855fa1576bd4a4b 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -109,8 +109,7 @@ class UserBlocksController < ApplicationController
   private
   ##
   # require that the user is a moderator, or fill out a helpful error message
-  # and return them to the login screen where they might be able to login as
-  # a moderator.
+  # and return them to the blocks index.
   def require_moderator
     unless @user.moderator?
       flash[:notice] = t('user_block.filter.not_a_moderator')