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

diff --combined test/controllers/user_blocks_controller_test.rb
index 57481abf8d52625747e6c726b8d843e3543de9da,277926fdc2f7d6cc7f6a96ee7140dca65a529fc2..e6782a64d0d3910393c70b026f1350b738211e3e
--- 1/test/controllers/user_blocks_controller_test.rb
--- 2/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@@ -13,10 -13,6 +13,6 @@@ class UserBlocksControllerTest < Action
        { :path => "/user_blocks", :method => :get },
        { :controller => "user_blocks", :action => "index" }
      )
-     assert_routing(
-       { :path => "/user_blocks/new", :method => :get },
-       { :controller => "user_blocks", :action => "new" }
-     )
      assert_routing(
        { :path => "/user_blocks", :method => :post },
        { :controller => "user_blocks", :action => "create" }
@@@ -799,8 -795,6 +795,8 @@@
    end
  
    def check_inactive_block_updates(block)
 +    original_ends_at = block.ends_at
 +
      put user_block_path(block,
                          :user_block_period => "0",
                          :user_block => { :needs_view => false, :reason => "Updated Reason" })
@@@ -809,7 -803,6 +805,7 @@@
      block.reload
      assert_not_predicate block, :active?
      assert_equal "Updated Reason", block.reason
 +    assert_equal original_ends_at, block.ends_at
  
      put user_block_path(block,
                          :user_block_period => "0",
@@@ -819,7 -812,6 +815,7 @@@
      block.reload
      assert_not_predicate block, :active?
      assert_equal "Updated Reason", block.reason
 +    assert_equal original_ends_at, block.ends_at
  
      put user_block_path(block,
                          :user_block_period => "1",
@@@ -829,7 -821,6 +825,7 @@@
      block.reload
      assert_not_predicate block, :active?
      assert_equal "Updated Reason", block.reason
 +    assert_equal original_ends_at, block.ends_at
  
      put user_block_path(block,
                          :user_block_period => "0",
@@@ -839,7 -830,6 +835,7 @@@
      block.reload
      assert_not_predicate block, :active?
      assert_equal "Updated Reason Again", block.reason
 +    assert_equal original_ends_at, block.ends_at
    end
  
    def check_user_blocks_table(user_blocks)