Return a warning string if we try to encode to unsupported encoding

Fixes gitlab-development-kit#321

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/encoding_helper.rb b/lib/gitlab/encoding_helper.rb
index c0edcabc6fd..6659efa0961 100644
--- a/lib/gitlab/encoding_helper.rb
+++ b/lib/gitlab/encoding_helper.rb
@@ -28,9 +28,9 @@ module Gitlab
 
       # encode and clean the bad chars
       message.replace clean(message)
-    rescue ArgumentError
-      return nil
-    rescue
+    rescue ArgumentError => e
+      return unless e.message.include?('unknown encoding name')
+
       encoding = detect ? detect[:encoding] : "unknown"
       "--broken encoding: #{encoding}"
     end