Skip to content

Manually exclude line ending changes from diffs - #2128

Merged
Oaphi merged 9 commits into
developfrom
trichoplax/manually-ignore-crlf-in-diffs
Aug 3, 2026
Merged

Manually exclude line ending changes from diffs#2128
Oaphi merged 9 commits into
developfrom
trichoplax/manually-ignore-crlf-in-diffs

Conversation

@trichoplax

@trichoplax trichoplax commented Aug 2, 2026

Copy link
Copy Markdown
Contributor

It seems Diffy's ignore_crlf option does not work consistently so this removes its use and instead passes normalized before and after strings to Diffy, removing the need for the option.

@codecov

codecov Bot commented Aug 2, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.02%. Comparing base (def3d07) to head (7498cdb).

Additional details and impacted files
Components Coverage Δ
controllers 76.84% <ø> (ø)
helpers 85.47% <ø> (ø)
jobs 77.43% <ø> (ø)
models 93.23% <100.00%> (+0.01%) ⬆️
tasks 61.11% <ø> (ø)

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@trichoplax
trichoplax requested review from MoshiKoi, Oaphi and cellio August 2, 2026 20:39

@cellio cellio left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested in my dev environment and the diffs are as expected. I tested on old posts, posts created between the normalization fix and develop, and a post newly created while on this branch. Edit diffs and history diffs are aligned and highlight the expected parts, not the entire post. Sometimes when you add a paragraph the previous one is highlighted because of the added newline; it doesn't always happen as shown in this screenshot, but this is existing behavior, not a regression.

diff screenshot

Comment thread app/views/post_history/_diff.html.erb Outdated
@Oaphi
Oaphi merged commit f4811c5 into develop Aug 3, 2026
14 checks passed
@Oaphi
Oaphi deleted the trichoplax/manually-ignore-crlf-in-diffs branch August 3, 2026 00:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants