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

diff --combined app/views/user_blocks/_blocks.html.erb
index d0c7a811755415a3546cd151ca26c80af8f3978d,7f44b6bc33191feaa0680ce8ccdf87f67565f7d9..de6feafa1e4d6ee695cedd90741ee9a34f67520a
--- 1/app/views/user_blocks/_blocks.html.erb
--- 2/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@@ -1,4 -1,4 +1,4 @@@
 -<turbo-frame id="pagination" target="_top">
 +<turbo-frame id="pagination" target="_top" data-turbo="false">
    <table id="block_list" class="table table-borderless table-striped table-sm">
      <thead>
        <tr>
@@@ -13,9 -13,6 +13,6 @@@
          <th><%= t ".revoker_name" %></th>
          <th></th>
          <th></th>
-         <% if can?(:revoke, UserBlock) %>
-         <th></th>
-         <% end %>
        </tr>
      </thead>
      <%= render :partial => "block", :collection => @user_blocks %>