diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-29 22:22:43 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-29 22:22:43 +0000 |
| commit | 604f39274dc1558f8710019e226b1a364f056d7e (patch) | |
| tree | ef10b8967df7ca2fbf31bc879e7bef92cbf22bd8 /GITLAB_SHELL_VERSION | |
| parent | d54f80980432d781b8730c672576e5e47620f502 (diff) | |
| parent | ca701a964971a3291270e60669757c9853e3cf66 (diff) | |
| download | gitlab-ce-604f39274dc1558f8710019e226b1a364f056d7e.tar.gz | |
Merge branch 'ldap-email-match' into 'master'
Improvements to LDAP::User model
* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
Fixes #1946
See merge request !1452
Diffstat (limited to 'GITLAB_SHELL_VERSION')
0 files changed, 0 insertions, 0 deletions