Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'

Encode Gitaly diff patches properly

See merge request !12368

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/lib/gitlab/git/diff_spec.rb b/spec/lib/gitlab/git/diff_spec.rb
index da213f617cc..28816778620 100644
--- a/spec/lib/gitlab/git/diff_spec.rb
+++ b/spec/lib/gitlab/git/diff_spec.rb
@@ -175,6 +175,14 @@ EOT
           expect(diff).to be_too_large
         end
       end
+
+      context 'when the patch passed is not UTF-8-encoded' do
+        let(:raw_patch) { @raw_diff_hash[:diff].encode(Encoding::ASCII_8BIT) }
+
+        it 'encodes diff patch to UTF-8' do
+          expect(diff.diff.encoding).to eq(Encoding::UTF_8)
+        end
+      end
     end
   end