Simplify rescuing of clean_encoding

69a28d5f · Stan Hu · 094a2590 · 69a28d5f
Commit 69a28d5f authored Oct 28, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

lib/ee/gitlab/ldap/sync/proxy.rb lib/ee/gitlab/ldap/sync/proxy.rb +2 -4

No files found.
--- a/lib/ee/gitlab/ldap/sync/proxy.rb
+++ b/lib/ee/gitlab/ldap/sync/proxy.rb
@@ -98,11 +98,9 @@ module EE
          # net-ldap only returns ASCII-8BIT and does not support UTF-8 out-of-the-box:
          # https://github.com/ruby-ldap/ruby-net-ldap/issues/4
          def clean_encoding(dn)
-            begin
              dn.force_encoding('UTF-8')
-            rescue
+          rescue
-              dn
+            dn
-            end
          end
          def member_uid_to_dn(uid)