diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-09-12 15:53:11 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-09-12 15:53:11 +0300 |
| commit | d02ee542b4a6ae769545d1637fc06a38ad8b298f (patch) | |
| tree | b079e25e74d336def54a928c417fe8e0c9586c4e /app | |
| parent | 6d437bc751867d23d13864976a90f426b3188743 (diff) | |
| parent | ce46b40252f5667c6dc5817acee62f100b693c53 (diff) | |
Merge branch '61841-fix-encoding-error-in-mr-diffs' into 'master'
Fix encoding error in MR diffs
Closes #61841
See merge request gitlab-org/gitlab-ce!32862
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request_diff_file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff_file.rb b/app/models/merge_request_diff_file.rb index 01ee82ae398..a532c1e6356 100644 --- a/app/models/merge_request_diff_file.rb +++ b/app/models/merge_request_diff_file.rb @@ -17,7 +17,7 @@ class MergeRequestDiffFile < ApplicationRecord if merge_request_diff&.stored_externally? merge_request_diff.opening_external_diff do |file| file.seek(external_diff_offset) - file.read(external_diff_size) + force_encode_utf8(file.read(external_diff_size)) end else super |