diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-11-23 13:48:57 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-23 13:48:57 +0300 |
| commit | 4cfcc97544c231c2baf8dc3ab232ed394355b62c (patch) | |
| tree | 0914bf3d34b8311d210ef94c5af341417dc76286 /lib/gitlab/encoding_helper.rb | |
| parent | ffa2a98034fb300f0e0d4ac438031f95a4359441 (diff) | |
Fix encoding bugs in Gitlab::Git::User
Diffstat (limited to 'lib/gitlab/encoding_helper.rb')
| -rw-r--r-- | lib/gitlab/encoding_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/encoding_helper.rb b/lib/gitlab/encoding_helper.rb index 99dfee3dd9b..582028493e9 100644 --- a/lib/gitlab/encoding_helper.rb +++ b/lib/gitlab/encoding_helper.rb @@ -17,6 +17,10 @@ module Gitlab return nil unless message.respond_to?(:force_encoding) return message if message.encoding == Encoding::UTF_8 && message.valid_encoding? + if message.respond_to?(:frozen?) && message.frozen? + message = message.dup + end + message.force_encoding("UTF-8") return message if message.valid_encoding? |