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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7ce804ced01af000ada0560ee4f27f99046618ac..fc90e0be7874652475307a695eefb2aece8990fb 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
 
   def self.allow_thirdparty_images(**options)
     content_security_policy(options) do |policy|
-      policy.img_src("*")
+      policy.img_src("*", :data)
     end
   end
 

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 998dd248d45a14b8d108fc9a3ffe1fddf13da563..4311ba082e39de12dd945f3a66bf011c9edfabc3 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -56,7 +56,8 @@
             </li>
           <% end %>
           <li class="nav-item">
-            <%= link_to t(".traces_from", :user => @target_user&.display_name), { :controller => "traces", :action => "index", :display_name => @target_user&.display_name }, { :class => "nav-link active" } %>
+            <%= link_to t(".traces_from_html", :user => tag.span(@target_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
+                        { :controller => "traces", :action => "index", :display_name => @target_user.display_name }, { :class => "nav-link active" } %>
           </li>
         <% end %>
       </ul>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3511e7f63c894e36b071df46cd7e901d21031ad8..fbb1f956c81d9178adb55b92aaf0948f9f2eacd7 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2543,7 +2543,7 @@ en:
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"
-      traces_from: "Public Traces from %{user}"
+      traces_from_html: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"