Merge branch 'fj-fix-regression-old-uploads' into 'master'

Fix regression with old wiki image uploads

See merge request gitlab-org/gitlab!52656

app/helpers/markup_helper.rb

@@ -126,7 +126,8 @@ module MarkupHelper
     text = wiki_page.content
     return '' unless text.present?
 
-    html = markup_unsafe(wiki_page.path, text, render_wiki_content_context(@wiki, wiki_page, context))
+    context = render_wiki_content_context(@wiki, wiki_page, context)
+    html = markup_unsafe(wiki_page.path, text, context)
 
     prepare_for_rendering(html, context)
   end

changelogs/unreleased/fj-fix-regression-old-uploads.yml

+---
+title: Fix regression with old wiki image uploads
+merge_request: 52656
+author:
+type: fixed

spec/helpers/markup_helper_spec.rb

@@ -355,6 +355,21 @@ RSpec.describe MarkupHelper do
           expect(doc.css('.gl-label-link')).not_to be_empty
         end
       end
+
+      context 'when content has uploads' do
+        let(:upload_link) { '/uploads/test.png' }
+        let(:content) { "![ImageTest](#{upload_link})" }
+
+        before do
+          allow(wiki).to receive(:wiki_base_path).and_return(project.wiki.wiki_base_path)
+        end
+
+        it 'renders uploads relative to project' do
+          result = helper.render_wiki_content(wiki)
+
+          expect(result).to include("#{project.full_path}#{upload_link}")
+        end
+      end
     end
 
     context 'when file is Asciidoc' do