From: Tom Hughes Date: Wed, 3 Aug 2022 19:37:56 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/3649' X-Git-Tag: live~1020 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d3388abe51a946ae0abc645d831a93b1b2cc6749?hp=e08a9979043b50fcde403a31ddca2d11ee07f518 Merge remote-tracking branch 'upstream/pull/3649' --- diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index a4b8b2642..8aa5b64c7 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -3,7 +3,7 @@ #<%= common_details.version %> -

+

<% if common_details.changeset.tags["comment"].present? %> <%= linkify(common_details.changeset.tags["comment"]) %> <% else %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 0861ed30f..4045c0b48 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -3,7 +3,7 @@ <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>

-

+

<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>

<%= changeset_details(@changeset) %>

diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb index a47a99d33..40ee4212a 100644 --- a/app/views/changesets/_changeset.html.erb +++ b/app/views/changesets/_changeset.html.erb @@ -11,7 +11,7 @@ end %> <%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %> -

+

<%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %> diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 74e096dd1..ba14f214e 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -38,7 +38,7 @@ <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %> <% end %>

-

+

<%= trace.description %>