Robert SpeicherandRobert Speicher a767bb4690 Merge branch 'fix_saml_signin' into 'master' ...

Fix subsequent SAML sign ins

Fixes a bug when `auto_link_ldap_user` is `true` that causes SAML users to be unable to sign in a second time.

Fix the problem for https://gitlab.zendesk.com/agent/tickets/22546

See merge request !4718

2016-06-23 14:28:43 -04:00

..

auth_hash.rb

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

2016-01-19 16:25:38 +01: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 'fix_saml_signin' into 'master'

2016-06-23 14:28:43 -04:00