Robert SpeicherandRobert Speicher a3a008f6b2 Merge branch 'user-ldap-email' into 'master' ...

Allow LDAP users to change their email if it was not set by the LDAP
server

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3054

See merge request !2502

2016-01-19 14:15:52 -05:00

..

access.rb

Merge branch 'feature/ldap-sync-edgecases' into 'master'

2016-01-14 11:00:08 +00:00

adapter.rb

Optimize LDAP and add a search timeout

2016-01-11 08:17:32 -06:00

auth_hash.rb

Fix LDAP attribute mapping

2015-09-23 16:37:59 +02:00

authentication.rb

Update authentication.rb

2015-05-04 14:09:03 +02:00

config.rb

Optimize LDAP and add a search timeout

2016-01-11 08:17:32 -06:00

person.rb

Faulty LDAP DN name escaping removed

2015-03-21 22:57:55 +01:00

user.rb

Merge branch 'user-ldap-email' into 'master'

2016-01-19 14:15:52 -05:00