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

[rails.git] / app / views / users / _user.html.erb

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 399ef8dcd89843d0c7603152b6b8ec99a5b95947..f01f8d1edce3d26bbe959e614df08df18d37639e 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -15,7 +15,7 @@
               :date => l(user.creation_time, :format => :friendly) %>
       <% end %>
     </p>
               :date => l(user.creation_time, :format => :friendly) %>
       <% end %>
     </p>

-    <div class="richtext"><%= user.description.to_html %></div>
+    <div class="richtext text-break"><%= user.description.to_html %></div>

   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>
   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>