diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-11 09:28:41 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-11 09:28:41 +0000 |
| commit | 767f7d9ae7eb29d5feaa65863a8948ca60d3825f (patch) | |
| tree | a33ac7cfc37428de548bd1470af59473b0b2c5bd /spec | |
| parent | 92a928468feeb7b7565ee348fd7c83a84fe16381 (diff) | |
| parent | c6d39a14d6b15f457bfc050f54e256cd5da64cc9 (diff) | |
| download | gitlab-ce-767f7d9ae7eb29d5feaa65863a8948ca60d3825f.tar.gz | |
Merge branch 'ldap-code' into 'master'
LDAP code from EE
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/ldap/ldap_user_auth_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb b/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb index a0e74c49631..501642dca79 100644 --- a/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb +++ b/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb @@ -9,7 +9,8 @@ describe Gitlab::LDAP do @info = double( uid: '12djsak321', name: 'John', - email: 'john@mail.com' + email: 'john@mail.com', + nickname: 'john' ) end |