diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-21 09:40:48 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-21 17:44:02 +0800 |
commit | 843f52ea6498363fdf99c36af6834ab394317103 (patch) | |
tree | 0d458a99354541f7b78a34edd48bbd160bc2735f | |
parent | 6b76909c8f46cc8373255cba2ee94dd770cac66f (diff) | |
download | gitlab-ce-843f52ea6498363fdf99c36af6834ab394317103.tar.gz |
Merge branch 'fix/encoding-issue' into 'master'
Fix encoding issue exporting a project
Closes #31186
See merge request !10824
-rw-r--r-- | changelogs/unreleased/fix-encoding-issue.yml | 4 | ||||
-rw-r--r-- | lib/gitlab/git/encoding_helper.rb | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/git/encoding_helper_spec.rb | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-encoding-issue.yml b/changelogs/unreleased/fix-encoding-issue.yml new file mode 100644 index 00000000000..5fa8ab46e72 --- /dev/null +++ b/changelogs/unreleased/fix-encoding-issue.yml @@ -0,0 +1,4 @@ +--- +title: Fix encoding issue exporting a project +merge_request: +author: diff --git a/lib/gitlab/git/encoding_helper.rb b/lib/gitlab/git/encoding_helper.rb index e57d228e688..f918074cb14 100644 --- a/lib/gitlab/git/encoding_helper.rb +++ b/lib/gitlab/git/encoding_helper.rb @@ -40,7 +40,13 @@ module Gitlab def encode_utf8(message) detect = CharlockHolmes::EncodingDetector.detect(message) if detect - CharlockHolmes::Converter.convert(message, detect[:encoding], 'UTF-8') + begin + CharlockHolmes::Converter.convert(message, detect[:encoding], 'UTF-8') + rescue ArgumentError => e + Rails.logger.warn("Ignoring error converting #{detect[:encoding]} into UTF8: #{e.message}") + + '' + end else clean(message) end diff --git a/spec/lib/gitlab/git/encoding_helper_spec.rb b/spec/lib/gitlab/git/encoding_helper_spec.rb index 27bcc241b82..f6ac7b23d1d 100644 --- a/spec/lib/gitlab/git/encoding_helper_spec.rb +++ b/spec/lib/gitlab/git/encoding_helper_spec.rb @@ -56,6 +56,10 @@ describe Gitlab::Git::EncodingHelper do expect(r.encoding.name).to eq('UTF-8') end end + + it 'returns empty string on conversion errors' do + expect { ext_class.encode_utf8('') }.not_to raise_error(ArgumentError) + end end describe '#clean' do |