Commit ce3676fb authored by Phil Hughes's avatar Phil Hughes

Merge branch '284640-fix-newline-in-custom-server-hook-renders-improperly' into 'master'

Resolve "Newlines in custom server hook error messages render improperly in merge UI"

See merge request gitlab-org/gitlab!51001
parents 6d8575a7 b9f10f45
...@@ -191,9 +191,13 @@ export default { ...@@ -191,9 +191,13 @@ export default {
mergeError = mergeError.slice(0, -1); mergeError = mergeError.slice(0, -1);
} }
return sprintf(s__('mrWidget|Merge failed: %{mergeError}. Please try again.'), { return sprintf(
mergeError, s__('mrWidget|Merge failed: %{mergeError}. Please try again.'),
}); {
mergeError,
},
false,
);
}, },
shouldShowAccessibilityReport() { shouldShowAccessibilityReport() {
return this.mr.accessibilityReportPath; return this.mr.accessibilityReportPath;
......
---
title: Fix multiple errors in custom server hook render improperly
merge_request: 51001
author: Kev @KevSlashNull
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment