diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-10 03:08:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-10 03:08:32 +0300 |
| commit | 537882ad400c403ff43a5db802f9756cb81286e4 (patch) | |
| tree | 26e93ea1985b0f5cdf74eb6e7799eca7faa8e998 /lib/gitlab/encoding_helper.rb | |
| parent | b296ffa543e23f57fa2692539e6f0028c59e2203 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/encoding_helper.rb')
| -rw-r--r-- | lib/gitlab/encoding_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/encoding_helper.rb b/lib/gitlab/encoding_helper.rb index 67f8d691a77..7b79de00c66 100644 --- a/lib/gitlab/encoding_helper.rb +++ b/lib/gitlab/encoding_helper.rb @@ -59,7 +59,7 @@ module Gitlab begin CharlockHolmes::Converter.convert(message, detect[:encoding], 'UTF-8') rescue ArgumentError => e - Rails.logger.warn("Ignoring error converting #{detect[:encoding]} into UTF8: #{e.message}") # rubocop:disable Gitlab/RailsLogger + Gitlab::AppLogger.warn("Ignoring error converting #{detect[:encoding]} into UTF8: #{e.message}") '' end |