Skip to content

Decorate rich_text with word-diff highlights

Kerri Miller requested to merge 26543-add-word-diff-highlight-to-rich-text into master

What does this MR do?

Run diff_lines through Gitlab::Diff::Highlighter#highlight in order to apply word-diff highlights to the contents of the rich_text field, revealing word/character level differences between lines. Display of this relies on a change to FE code to switch from display the context of the text field to the rich_text field.

Screenshots

Previewing Suggestion

_deloox___GitLab_2019-12-22_10-25-08

Saved DiffNote with Suggestion

_deloox___GitLab_2019-12-22_10-24-31

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Addresses #26543 (closed)

Edited by 🤖 GitLab Bot 🤖

Merge request reports