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

diff --combined test/controllers/redactions_controller_test.rb
index 0bf57c3102c7b9f982fc1d4dbf3cce4243516416,08f32d4d0cea97b1ee4f28eb2f6eaef347d478e7..fa56814b27e8403c6d90c9071bbde90de105490d
--- 1/test/controllers/redactions_controller_test.rb
--- 2/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@@ -1,4 -1,5 +1,4 @@@
  require "test_helper"
 -require "redactions_controller"
  
  class RedactionsControllerTest < ActionController::TestCase
    ##
@@@ -63,8 -64,7 +63,7 @@@
      session[:user] = create(:user).id
  
      get :new
-     assert_response :redirect
-     assert_redirected_to redactions_path
+     assert_response :forbidden
    end
  
    def test_create_moderator
@@@ -140,8 -140,7 +139,7 @@@
      session[:user] = create(:user).id
  
      get :edit, :params => { :id => create(:redaction).id }
-     assert_response :redirect
-     assert_redirected_to(redactions_path)
+     assert_response :forbidden
    end
  
    def test_update_moderator