Merge branch 'bvl-remove-project-object-from-error-logging' into 'master'

Remove context from markup rendering error logging

Closes #202132

See merge request gitlab-org/gitlab!24599

app/helpers/markup_helper.rb

@@ -153,7 +153,7 @@ module MarkupHelper
       other_markup_unsafe(file_name, text, context)
     end
   rescue StandardError => e
-    Gitlab::ErrorTracking.track_exception(e, project_id: @project&.id, file_name: file_name, context: context)
+    Gitlab::ErrorTracking.track_exception(e, project_id: @project&.id, file_name: file_name)
 
     simple_format(text)
   end

changelogs/unreleased/bvl-remove-project-object-from-error-logging.yml

+---
+title: Don't leak entire objects into the error log when rendering markup fails
+merge_request: 24599
+author:
+type: fixed

spec/helpers/markup_helper_spec.rb

@@ -403,7 +403,7 @@ describe MarkupHelper do
         it 'logs the error' do
           expect(Gitlab::ErrorTracking).to receive(:track_exception).with(
             instance_of(StandardError),
-            project_id: project.id, file_name: 'foo.md', context: context
+            project_id: project.id, file_name: 'foo.md'
           )
 
           subject