Merge branch '36458-user-profile-activity-feed-contains-broken-image-links' into 'master'

Resolve "User profile activity feed contains broken image links"

Closes #36458

See merge request !13606

2 files changed, 7 insertions, 1 deletions

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 48c87dca217..b6c2ed5bb60 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -176,7 +176,7 @@ module EventsHelper
     sanitize(
       text,
       tags: %w(a img gl-emoji b pre code p span),
-      attributes: Rails::Html::WhiteListSanitizer.allowed_attributes + ['style', 'data-name', 'data-unicode-version']
+      attributes: Rails::Html::WhiteListSanitizer.allowed_attributes + ['style', 'data-src', 'data-name', 'data-unicode-version']
     )
   end
 
diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb
index aa138f25bd3..4b72dbb7964 100644
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
@@ -62,6 +62,12 @@ describe EventsHelper do
       expect(helper.event_note(input)).to eq(expected)
     end
 
+    it 'preserves data-src for lazy images' do
+      input = "![ImageTest](/uploads/test.png)"
+      image_url = "data-src=\"/uploads/test.png\""
+      expect(helper.event_note(input)).to match(image_url)
+    end
+
     context 'labels formatting' do
       let(:input) { 'this should be ~label_1' }