From: Tom Hughes <tom@compton.nu>
Date: Fri, 23 Aug 2024 17:09:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5110'
X-Git-Tag: live~225
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ec5754a9bd56dbb802a2897851ebf71deb017f89?ds=inline;hp=-c

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

ec5754a9bd56dbb802a2897851ebf71deb017f89
diff --combined app/views/user_blocks/_blocks.html.erb
index d0c7a8117,7f44b6bc3..de6feafa1
--- a/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 %>