diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-18 10:26:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-18 10:26:51 +0000 |
| commit | be3bddf90d81b84243b74c3013202aad1c4ab3a9 (patch) | |
| tree | eeeae5726e1cc5486a30d78a83032495e33df8f7 /lib | |
| parent | 0fa2f14857ceb5b5b52595555bb2c3e6e930e1f7 (diff) | |
| parent | b40ff63412ef89ba61a4215ee7478b06b22cf9ca (diff) | |
| download | gitlab-ce-be3bddf90d81b84243b74c3013202aad1c4ab3a9.tar.gz | |
Merge branch 'tc-saml-fix-false-empty' into 'master'
SAML fix when auth hash attributes do not define groups
Closes #38923
See merge request gitlab-org/gitlab-ce!14913
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/saml/auth_hash.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/saml/auth_hash.rb b/lib/gitlab/saml/auth_hash.rb index 67a5f368bdb..33d19373098 100644 --- a/lib/gitlab/saml/auth_hash.rb +++ b/lib/gitlab/saml/auth_hash.rb @@ -2,7 +2,7 @@ module Gitlab module Saml class AuthHash < Gitlab::OAuth::AuthHash def groups - get_raw(Gitlab::Saml::Config.groups) + Array.wrap(get_raw(Gitlab::Saml::Config.groups)) end private |