From: Tom Hughes Date: Mon, 15 Apr 2024 17:45:26 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4705' X-Git-Tag: live~625 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0547bda93fe463069bcd79415dacf5b039b24733?hp=48fc453dd0c2050e744faefbd62265c625f8e72f Merge remote-tracking branch 'upstream/pull/4705' --- diff --git a/Gemfile.lock b/Gemfile.lock index f3e39e829..2d790b5c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,13 +95,13 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.910.0) + aws-partitions (1.913.0) aws-sdk-core (3.191.6) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.78.0) + aws-sdk-kms (1.79.0) aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.146.1) @@ -328,7 +328,7 @@ GEM maxminddb (0.1.22) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) + mini_portile2 (2.8.6) mini_racer (0.9.0) libv8-node (~> 18.19.0.0) minitest (5.22.3) @@ -350,7 +350,7 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.1) - nokogiri (1.16.3) + nokogiri (1.16.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (0.4.7) @@ -485,7 +485,7 @@ GEM rouge (4.2.1) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.63.0) + rubocop (1.63.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -539,6 +539,8 @@ GEM simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) + simpleidn (0.2.1) + unf (~> 0.1.4) smart_properties (1.17.0) snaky_hash (2.0.1) hashie @@ -569,10 +571,14 @@ GEM railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.9.1) unicode-display_width (2.5.0) uri (0.13.0) - validates_email_format_of (1.7.2) - i18n + validates_email_format_of (1.8.2) + i18n (>= 0.8.0) + simpleidn vendorer (0.2.0) version_gem (1.1.4) webmock (3.23.0) diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb index a4357a3f5..b219f4c32 100644 --- a/app/views/changesets/_changeset.html.erb +++ b/app/views/changesets/_changeset.html.erb @@ -12,7 +12,7 @@ <%= 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") %>

@@ -20,7 +20,7 @@
<%= changeset_details(changeset) %> · - + #<%= changeset.id %>
diff --git a/app/views/messages/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb index 81ef48402..02c60a752 100644 --- a/app/views/messages/_message_summary.html.erb +++ b/app/views/messages/_message_summary.html.erb @@ -2,12 +2,14 @@ <%= link_to message.sender.display_name, user_path(message.sender) %> <%= link_to message.title, message_path(message) %> <%= l message.sent_on, :format => :friendly %> - - <%= button_to t(".unread_button"), message_mark_path(message, :mark => "unread"), :class => "btn btn-sm btn-primary", :form => { :data => { :turbo => true }, :class => "inbox-mark-unread", :hidden => !message.message_read? } %> - <%= button_to t(".read_button"), message_mark_path(message, :mark => "read"), :class => "btn btn-sm btn-primary", :form => { :data => { :turbo => true }, :class => "inbox-mark-read", :hidden => message.message_read? } %> - <%= button_to t(".destroy_button"), message_path(message, :referer => request.fullpath), :method => :delete, :class => "btn btn-sm btn-danger", :form => { :data => { :turbo => true }, :class => "destroy-message" } %> - <% if message.muted? %> - <%= button_to t(".unmute_button"), message_unmute_path(message), :method => :patch, :class => "btn btn-sm btn-secondary", :form => { :data => { :turbo => true } } %> - <% end %> + +
+ <%= button_to t(".unread_button"), message_mark_path(message, :mark => "unread"), :class => "btn btn-sm btn-primary", :form => { :data => { :turbo => true }, :class => "inbox-mark-unread", :hidden => !message.message_read? } %> + <%= button_to t(".read_button"), message_mark_path(message, :mark => "read"), :class => "btn btn-sm btn-primary", :form => { :data => { :turbo => true }, :class => "inbox-mark-read", :hidden => message.message_read? } %> + <%= button_to t(".destroy_button"), message_path(message, :referer => request.fullpath), :method => :delete, :class => "btn btn-sm btn-danger", :form => { :data => { :turbo => true }, :class => "destroy-message" } %> + <% if message.muted? %> + <%= button_to t(".unmute_button"), message_unmute_path(message), :method => :patch, :class => "btn btn-sm btn-secondary", :form => { :data => { :turbo => true } } %> + <% end %> +
diff --git a/app/views/messages/_sent_message_summary.html.erb b/app/views/messages/_sent_message_summary.html.erb index 683d8d6ad..82bbafc16 100644 --- a/app/views/messages/_sent_message_summary.html.erb +++ b/app/views/messages/_sent_message_summary.html.erb @@ -2,7 +2,9 @@ <%= link_to message.recipient.display_name, user_path(message.recipient) %> <%= link_to message.title, message_path(message) %> <%= l message.sent_on, :format => :friendly %> - - <%= button_to t(".destroy_button"), message_path(message, :referer => request.fullpath), :method => :delete, :class => "btn btn-sm btn-danger", :form => { :data => { :turbo => true }, :class => "destroy-message" } %> + +
+ <%= button_to t(".destroy_button"), message_path(message, :referer => request.fullpath), :method => :delete, :class => "btn btn-sm btn-danger", :form => { :data => { :turbo => true }, :class => "destroy-message" } %> +