Merge branch 'master' into next

[rails.git] / app / views / user / view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 3a09165b9d34ba8eafadfb0a5ddc96becc2352b4..0acb3f0145a622e05207d1bb109c18083064e503 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -102,6 +102,11 @@
             </li>
           <% end %>
 
+          <% if current_user and @user.id != current_user.id %>
+            <li>
+              <%= report_link(t(".report"), @user) %>
+            </li>
+          <% end %>
         </ul>
 
       <% end %>