wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Force utf8 encoding for diffs

Browse Source
This commit is contained in:
Dawa Ometto
2021-07-31 10:29:13 +02:00
parent 046353cf7e
commit 9bc3baa1dc
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/app.rb
+3 -3
View File
@@ -410,7 +410,7 @@ module Precious
else
sha2, sha1 = sha1, "#{sha1}^" if !sha2
@versions = [sha1, sha2]
@diff = wiki.repo.diff(@versions.first, @versions.last, @page.path)
@diff = wiki.repo.diff(@versions.first, @versions.last, @page.path).force_encoding('utf-8')
@message = 'The patch does not apply.'
mustache :compare
end
@@ -475,7 +475,7 @@ module Precious
@versions = [start_version, end_version]
wiki = wikip.wiki
@page = wikip.page
@diff = wiki.repo.diff(@versions.first, @versions.last, @page.path)
@diff = wiki.repo.diff(@versions.first, @versions.last, @page.path).force_encoding('utf-8')
if @diff.empty?
@message = 'Could not compare these two revisions, no differences were found.'
mustache :error
@@ -519,7 +519,7 @@ module Precious
@commit = wiki.repo.commit(version)
parent = @commit.parent
parent_id = parent.nil? ? nil : parent.id
@diff = wiki.repo.diff(parent_id, version)
@diff = wiki.repo.diff(parent_id, version).force_encoding('utf-8')
mustache :commit
rescue Gollum::Git::NoSuchShaFound
@message = "Invalid commit: #{@version}"