Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master'

Resolve "Renamed files have escaped HTML for the inline diff in the header"

Closes #37576

See merge request gitlab-org/gitlab-ce!14121

4 files changed, 22 insertions, 3 deletions

diff --git a/changelogs/unreleased/37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header.yml b/changelogs/unreleased/37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header.yml
new file mode 100644
index 00000000000..8c328eb0950
--- /dev/null
+++ b/changelogs/unreleased/37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header.yml
@@ -0,0 +1,5 @@
+---
+title: Fix the diff file header from being html escaped for renamed files.
+merge_request: 14121
+author:
+type: fixed
diff --git a/lib/gitlab/diff/inline_diff_marker.rb b/lib/gitlab/diff/inline_diff_marker.rb
index 919965100ae..010b4be7b40 100644
--- a/lib/gitlab/diff/inline_diff_marker.rb
+++ b/lib/gitlab/diff/inline_diff_marker.rb
@@ -2,9 +2,10 @@ module Gitlab
   module Diff
     class InlineDiffMarker < Gitlab::StringRangeMarker
       def mark(line_inline_diffs, mode: nil)
-        super(line_inline_diffs) do |text, left:, right:|
+        mark = super(line_inline_diffs) do |text, left:, right:|
           %{<span class="#{html_class_names(left, right, mode)}">#{text}</span>}
         end
+        mark.html_safe
       end
 
       private
diff --git a/spec/features/projects/diffs/diff_show_spec.rb b/spec/features/projects/diffs/diff_show_spec.rb
index bc102895aaf..a6f52c9ef58 100644
--- a/spec/features/projects/diffs/diff_show_spec.rb
+++ b/spec/features/projects/diffs/diff_show_spec.rb
@@ -108,6 +108,19 @@ feature 'Diff file viewer', :js do
     end
   end
 
+  context 'renamed file' do
+    before do
+      visit_commit('6907208d755b60ebeacb2e9dfea74c92c3449a1f')
+    end
+
+    it 'shows the filename with diff highlight' do
+      within('.file-header-content') do
+        expect(page).to have_css('.idiff.left.right.deletion')
+        expect(page).to have_content('files/js/commit.coffee')
+      end
+    end
+  end
+
   context 'binary file that appears to be text in the first 1024 bytes' do
     before do
       # The file we're visiting is smaller than 10 KB and we want it collapsed
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb
index 0deea0ff6a3..f9c31ac61d8 100644
--- a/spec/helpers/diff_helper_spec.rb
+++ b/spec/helpers/diff_helper_spec.rb
@@ -136,9 +136,9 @@ describe DiffHelper do
       marked_old_line, marked_new_line = mark_inline_diffs(old_line, new_line)
 
       expect(marked_old_line).to eq(%q{abc <span class="idiff left right deletion">'def'</span>})
-      expect(marked_old_line).not_to be_html_safe
+      expect(marked_old_line).to be_html_safe
       expect(marked_new_line).to eq(%q{abc <span class="idiff left right addition">"def"</span>})
-      expect(marked_new_line).not_to be_html_safe
+      expect(marked_new_line).to be_html_safe
     end
   end