Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/5365'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Dec 2, 2024
2 parents aa4354b + c4d16ab commit c4988a6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/views/user_blocks/_block.html.erb
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<tr>
<% if @show_user_name %>
<td><%= link_to block.user.display_name, block.user, :class => "username d-inline-block text-truncate text-wrap" %></td>
<td><%= link_to block.user.display_name, block.user, :class => "username d-inline-block text-truncate text-wrap", :dir => "auto" %></td>
<% end %>
<% if @show_creator_name %>
<td><%= link_to block.creator.display_name, block.creator, :class => "username d-inline-block text-truncate text-wrap" %></td>
<td><%= link_to block.creator.display_name, block.creator, :class => "username d-inline-block text-truncate text-wrap", :dir => "auto" %></td>
<% end %>
<td><%= h truncate(block.reason) %></td>
<td><%= h block_status(block) %></td>
<td>
<% if block.revoker_id.nil? %>
<%= t(".not_revoked") %>
<% else %>
<%= link_to block.revoker.display_name, block.revoker %>
<%= link_to block.revoker.display_name, block.revoker, :class => "username d-inline-block text-truncate text-wrap", :dir => "auto" %>
<% end %>
</td>
<td><%= link_to t(".show"), block %></td>
Expand Down

0 comments on commit c4988a6

Please sign in to comment.