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

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

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index ef790103e47c1f156db5126fd3567c6b0143d79f..cbc2ee23c0b39297c07f4aac73acd2c6121a0082 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -7,10 +7,10 @@
   <% end %>
   <td><%= h truncate(block.reason) %></td>
   <td><%= block_short_time_in_past(block.created_at) %></td>
-  <% if block.active? %>
+  <% if block.ends_at > Time.now.utc %>
   <td><%= block_short_time_in_future(block.ends_at) %></td>
   <% else %>
-  <td><%= block_short_time_in_past([block.ends_at, block.updated_at].max) %></td>
+  <td><%= block_short_time_in_past(block.ends_at) %></td>
   <% end %>
   <td><%= h block_short_status(block) %></td>
   <td><%= link_to t(".show"), block %></td>