summaryrefslogtreecommitdiff
path: root/tmp
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-09-16 18:34:55 +0000
committerRobert Speicher <robert@gitlab.com>2015-09-16 18:34:55 +0000
commit09bcce7d1f29a175734cdf97e33b8ffb1182f02d (patch)
tree2991e3a96a5c5a6457ac9c209bd9b5aff14d36c9 /tmp
parenta0aa6453bd0099a0e1d0bfd6725fff8aaa9d29a9 (diff)
parent84d57bc70391f0419bc60c8fcffb3694078d8fb9 (diff)
downloadgitlab-ce-09bcce7d1f29a175734cdf97e33b8ffb1182f02d.tar.gz
Merge branch 'ldap-attributes' into 'master'
Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
Diffstat (limited to 'tmp')
0 files changed, 0 insertions, 0 deletions