From e8b806264d92a35ff2acd1aaed543f760cf0936f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 12 Apr 2025 18:12:02 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/assets/stylesheets/page_bundles/notes/_system_notes.scss | 2 +-
 app/services/system_notes/issuables_service.rb               | 2 +-
 spec/services/issues/update_service_spec.rb                  | 4 ++--
 spec/services/merge_requests/update_service_spec.rb          | 4 ++--
 spec/services/system_notes/issuables_service_spec.rb         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/page_bundles/notes/_system_notes.scss b/app/assets/stylesheets/page_bundles/notes/_system_notes.scss
index db7416dfbdf..b22fee3df6b 100644
--- a/app/assets/stylesheets/page_bundles/notes/_system_notes.scss
+++ b/app/assets/stylesheets/page_bundles/notes/_system_notes.scss
@@ -15,7 +15,7 @@
 
 .system-note {
   .note-text {
-    // System notes render the text twice; this hides the secon done. Do not remove!
+    // System notes render the text twice; this hides the second one. Do not remove!
     p:first-child {
       display: none;
     }
diff --git a/app/services/system_notes/issuables_service.rb b/app/services/system_notes/issuables_service.rb
index 60e5df274eb..b25d486db36 100644
--- a/app/services/system_notes/issuables_service.rb
+++ b/app/services/system_notes/issuables_service.rb
@@ -188,7 +188,7 @@ module SystemNotes
       marked_old_title = Gitlab::Diff::InlineDiffMarker.new(old_title).mark(old_diffs)
       marked_new_title = Gitlab::Diff::InlineDiffMarker.new(new_title).mark(new_diffs)
 
-      body = "<div>changed title from <code class=\"idiff\">#{marked_old_title}</code> to <code class=\"idiff\">#{marked_new_title}</code></div>"
+      body = "<p>changed title from <code class=\"idiff\">#{marked_old_title}</code> to <code class=\"idiff\">#{marked_new_title}</code></p>"
 
       track_issue_event(:track_issue_title_changed_action)
       work_item_activity_counter.track_work_item_title_changed_action(author: author) if noteable.is_a?(WorkItem)
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index d0f0d37b3e8..2df24435b6c 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -523,9 +523,9 @@ RSpec.describe Issues::UpdateService, :mailer, feature_category: :team_planning
         end
 
         it 'creates system note about title change' do
-          note = find_note('<div>changed title')
+          note = find_note('<p>changed title')
 
-          expect(note.note).to eq '<div>changed title from <code class="idiff"><span class="idiff left right deletion">Old</span> title</code> to <code class="idiff"><span class="idiff left right addition">New</span> title</code></div>'
+          expect(note.note).to eq '<p>changed title from <code class="idiff"><span class="idiff left right deletion">Old</span> title</code> to <code class="idiff"><span class="idiff left right addition">New</span> title</code></p>'
         end
 
         it 'creates system note about discussion lock' do
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 904523ae409..8a2f43942ba 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -322,10 +322,10 @@ RSpec.describe MergeRequests::UpdateService, :mailer, feature_category: :code_re
       it 'creates system note about title change' do
         update_merge_request(opts)
 
-        note = find_note('<div>changed title')
+        note = find_note('<p>changed title')
 
         expect(note).not_to be_nil
-        expect(note.note).to eq '<div>changed title from <code class="idiff"><span class="idiff left right deletion">Old</span> title</code> to <code class="idiff"><span class="idiff left right addition">New</span> title</code></div>'
+        expect(note.note).to eq '<p>changed title from <code class="idiff"><span class="idiff left right deletion">Old</span> title</code> to <code class="idiff"><span class="idiff left right addition">New</span> title</code></p>'
       end
 
       it 'creates system note about description change' do
diff --git a/spec/services/system_notes/issuables_service_spec.rb b/spec/services/system_notes/issuables_service_spec.rb
index f120da79256..076aaaebada 100644
--- a/spec/services/system_notes/issuables_service_spec.rb
+++ b/spec/services/system_notes/issuables_service_spec.rb
@@ -317,7 +317,7 @@ RSpec.describe ::SystemNotes::IssuablesService, feature_category: :team_planning
 
       it 'sets the note text' do
         expect(subject.note)
-          .to eq %q(<div>changed title from <code class="idiff"><span class="idiff left right deletion">Old **title**</span></code> to <code class="idiff"><span class="idiff left right addition">_Lorem_ ipsum</span></code></div>)
+          .to eq %q(<p>changed title from <code class="idiff"><span class="idiff left right deletion">Old **title**</span></code> to <code class="idiff"><span class="idiff left right addition">_Lorem_ ipsum</span></code></p>)
       end
     end
   end