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

[rails.git] / app / views / browse / _common_details.html.erb

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 44bbe04f8c1ec408e50e24c0092bc8a1892e9ff7..669e0fe6dee4358452740c2540c041080d4cb0c7 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,6 +1,6 @@
 <h4>
   <% if common_details.changeset.tags['comment'].present? %>
 <h4>
   <% if common_details.changeset.tags['comment'].present? %>

-    <%= linkify(h(common_details.changeset.tags["comment"])) %>
+    <%= linkify(common_details.changeset.tags["comment"]) %>

   <% else %>
     <%= t "browse.no_comment" %>
   <% end %>
   <% else %>
     <%= t "browse.no_comment" %>
   <% end %>


@@ -8,14 +8,14 @@
 
 <div class="details">
   <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
 
 <div class="details">
   <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",

-        :time => distance_of_time_in_words_to_now(common_details.timestamp),
+        :time => time_ago_in_words(common_details.timestamp, :scope => :'datetime.distance_in_words_ago'),

         :user => changeset_user_link(common_details.changeset),
         :title => l(common_details.timestamp) %>
 </div>
 
 <div class="details">
   <%= t "browse.version" %>
         :user => changeset_user_link(common_details.changeset),
         :title => l(common_details.timestamp) %>
 </div>
 
 <div class="details">
   <%= t "browse.version" %>

-  #<%= h(common_details.version) %>
+  #<%= common_details.version %>

   &middot;
   <%= t "browse.in_changeset" %>
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
   &middot;
   <%= t "browse.in_changeset" %>
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>