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

..

auth_hash.rb

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

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

provider.rb

Use proper labels for OAuth providers

2015-11-03 17:59:07 +01:00

session.rb

add CAS authentication support

2015-12-14 21:43:41 -06:00

user.rb

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

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