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

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

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index 42e75ecf0a5597685a62508820baa2c6ea7cee6d..57cef6055992722523a71dc475feb718b6c1423a 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -4,7 +4,7 @@
 <% end %>
 
 <% unless @user_blocks.empty? %>
 <% end %>
 
 <% unless @user_blocks.empty? %>

-<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user && current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => true, :show_creator_name => true } %>

 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>
 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>