diff options
Diffstat (limited to 'app/models/wiki_page.rb')
| -rw-r--r-- | app/models/wiki_page.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index e1468872f52..a7e2be0eae5 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -284,10 +284,9 @@ class WikiPage def content_changed? if persisted? - # gollum-lib always converts CRLFs to LFs in Gollum::Wiki#normalize, - # so we need to do the same here. - # Also see https://gitlab.com/gitlab-org/gitlab/-/issues/21431 - raw_content.delete("\r") != page&.text_data + # To avoid end-of-line differences depending if Git is enforcing CRLF or not, + # we compare just the Wiki Content. + raw_content.lines(chomp: true) != page&.text_data&.lines(chomp: true) else raw_content.present? end |