diff options
author | Robert Speicher <robert@gitlab.com> | 2015-08-18 15:56:30 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-08-18 15:56:30 +0000 |
commit | 204914983a015170ea1ca4cf6040c04d9a1ec1d9 (patch) | |
tree | 644da4ce10282977ddc9d01c14097bce47f54a75 /spec | |
parent | 04e1c4d3da4e0f0013b9c77a339951a2b7555415 (diff) | |
parent | c16b1651f5e20caffdbb716ff52857c47326a9b6 (diff) | |
download | gitlab-ce-204914983a015170ea1ca4cf6040c04d9a1ec1d9.tar.gz |
Merge branch 'fix-authhash-infinite-loop' into 'master'
Fix infinite loop when SAML was incorrectly configured.
See merge request !1170
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/o_auth/auth_hash_spec.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/lib/gitlab/o_auth/auth_hash_spec.rb b/spec/lib/gitlab/o_auth/auth_hash_spec.rb index 4c0a4a49d2a..e4a6cd954cc 100644 --- a/spec/lib/gitlab/o_auth/auth_hash_spec.rb +++ b/spec/lib/gitlab/o_auth/auth_hash_spec.rb @@ -91,10 +91,6 @@ describe Gitlab::OAuth::AuthHash do expect(auth_hash.name.encoding).to eql Encoding::UTF_8 end - it 'forces utf8 encoding on full_name' do - expect(auth_hash.full_name.encoding).to eql Encoding::UTF_8 - end - it 'forces utf8 encoding on username' do expect(auth_hash.username.encoding).to eql Encoding::UTF_8 end |