diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-09-14 14:14:39 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-09-14 14:14:39 +0000 |
| commit | cbf64aeca5981728036e5252391b57221e2dbcb4 (patch) | |
| tree | 93b8298d2599160ba7f3dbfbd3bfa8dbcfa1fcd8 /lib | |
| parent | 4533c28840d9a5dc01094a437d209c0a309e14ce (diff) | |
| parent | cc66c3fda295c992f9e4e804ebc3af774a599f6a (diff) | |
| download | gitlab-ce-cbf64aeca5981728036e5252391b57221e2dbcb4.tar.gz | |
Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'
Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider
Closes #37845
See merge request gitlab-org/gitlab-ce!14263
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/o_auth/auth_hash.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/o_auth/auth_hash.rb b/lib/gitlab/o_auth/auth_hash.rb index 1f331b1e91d..5b5ed449f94 100644 --- a/lib/gitlab/o_auth/auth_hash.rb +++ b/lib/gitlab/o_auth/auth_hash.rb @@ -13,7 +13,7 @@ module Gitlab end def provider - @provider ||= Gitlab::Utils.force_utf8(auth_hash.provider.to_s) + @provider ||= auth_hash.provider.to_s end def name |