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

diff --cc app/controllers/user_blocks_controller.rb
index ae6e3c1cd5f4f3b7fc26646cd8ae346ebdb75cb1,73c6ccd69e1b73da6003217449d4dd0f71c7528d..71a0b4c31582a09a5d4687ba5e9a74207b59b216
--- 1/app/controllers/user_blocks_controller.rb
--- 2/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@@ -72,7 -74,7 +74,8 @@@ class UserBlocksController < Applicatio
          @user_block.reason = params[:user_block][:reason]
          @user_block.needs_view = params[:user_block][:needs_view]
          @user_block.ends_at = Time.now.utc + @block_period.hours
+         @user_block.deactivates_at = (@user_block.ends_at unless @user_block.needs_view)
 +        @user_block.revoker = current_user if user_block_was_active && !@user_block.active?
          if !user_block_was_active && @user_block.active?
            flash.now[:error] = t(".inactive_block_cannot_be_reactivated")
            render :action => "edit"

diff --cc test/controllers/user_blocks_controller_test.rb
Simple merge