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

[rails.git] / app / views / user_blocks / _blocks.html.erb

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index d0c7a811755415a3546cd151ca26c80af8f3978d..8c8557f606e358b196d170209ecbb5779947ccd1 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -13,17 +13,12 @@
         <th><%= t ".revoker_name" %></th>
         <th></th>
         <th></th>
-        <% if can?(:revoke, UserBlock) %>
-        <th></th>
-        <% end %>
       </tr>
     </thead>
     <%= render :partial => "block", :collection => @user_blocks %>
   </table>
 
   <%= render "shared/pagination",
-             :newer_key => "user_blocks.blocks.newer",
-             :older_key => "user_blocks.blocks.older",
              :newer_id => @newer_user_blocks_id,
              :older_id => @older_user_blocks_id %>
 </turbo-frame>