Merge branch 'tor/defect/single-quote-escapes' into 'master'

Fix character escaping in Resolved By tooltips

See merge request gitlab-org/gitlab!59428

app/assets/javascripts/batch_comments/mixins/resolved_status.js

@@ -50,12 +50,18 @@ export default {
       return this.resolveDiscussion ? 'is-resolving-discussion' : 'is-unresolving-discussion';
     },
     resolveButtonTitle() {
+      const escapeParameters = false;
+
       if (this.isDraft || this.discussionId) return this.resolvedStatusMessage;
 
       let title = __('Resolve thread');
 
       if (this.resolvedBy) {
-        title = sprintf(__('Resolved by %{name}'), { name: this.resolvedBy.name });
+        title = sprintf(
+          __('Resolved by %{name}'),
+          { name: this.resolvedBy.name },
+          escapeParameters,
+        );
       }
 
       return title;

changelogs/unreleased/tor-defect-single-quote-escapes.yml

+---
+title: Fix character escaping in Resolved By tooltips
+merge_request: 59428
+author:
+type: fixed

spec/frontend/notes/components/note_actions_spec.js

@@ -151,6 +151,22 @@ describe('noteActions', () => {
         const assignUserButton = wrapper.find('[data-testid="assign-user"]');
         expect(assignUserButton.exists()).toBe(false);
       });
+
+      it('should render the correct (unescaped) name in the Resolved By tooltip', () => {
+        const complexUnescapedName = 'This is a Ǝ\'𝞓\'E "cat"?';
+        wrapper = mountNoteActions({
+          ...props,
+          canResolve: true,
+          isResolving: false,
+          isResolved: true,
+          resolvedBy: {
+            name: complexUnescapedName,
+          },
+        });
+
+        const { resolveButton } = wrapper.vm.$refs;
+        expect(resolveButton.$el.getAttribute('title')).toBe(`Resolved by ${complexUnescapedName}`);
+      });
     });
   });