summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorAlex Lossent <alexandre.lossent@cern.ch>2015-06-02 12:01:29 +0200
committerAlex Lossent <alexandre.lossent@cern.ch>2015-06-03 11:46:20 +0200
commitdfcea8ed514c7ef1aea78ce15525e617a10bf6bb (patch)
tree40554eb7954cdb4593508302282af7d33ff4cce1 /CHANGELOG
parent41d4aaa4be6ef39a97e07dedbeda839b5667f221 (diff)
downloadgitlab-ce-dfcea8ed514c7ef1aea78ce15525e617a10bf6bb.tar.gz
Add option to automatically link omniauth and LDAP identities
Until now, a user needed to first sign in with his LDAP identity and then manually link his/her account with an omniauth identity from their profile. Only when this is done can the user authenticate with the omniauth provider and at the same time benefit from the LDAP integration (HTTPS authentication with LDAP username/password and in EE: LDAP groups, SSH keys etc.). This feature automates the process by looking up a corresponding LDAP person when a user connects with omniauth for the first time and then automatically linking the LDAP and omniauth identities (of course, like the existing allow_single_sign_on setting, this is meant to be used with trusted omniauth providers). The result is identical to a manual account link. Add config initializers for other omniauth settings.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 85fa933fa6b..b0136f3a83a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -41,6 +41,7 @@ v 7.12.0 (unreleased)
- Add an option to automatically sign-in with an Omniauth provider
- Better performance for web editor (switched from satellites to rugged)
- GitLab CI service sends .gitlab-ci.yaml in each push call
+ - Add option to automatically link omniauth and LDAP identities
v 7.11.4
- Fix missing bullets when creating lists