summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-06-05 13:34:25 +0200
committerDouwe Maan <douwe@gitlab.com>2015-06-05 13:34:25 +0200
commit3f59a8f0be101c2405372d05a304540beb1b6d01 (patch)
tree60db46574ab7f6c238ac8b0bd1a9ee5eee31628b /CHANGELOG
parent214f38c4223091ce37d41582feacae09120db5d9 (diff)
parent45e9150a517970d3782bed642b091ad60a46634f (diff)
downloadgitlab-ce-3f59a8f0be101c2405372d05a304540beb1b6d01.tar.gz
Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3df8e7ea516..08b879a2391 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,7 @@ v 7.12.0 (unreleased)
- When remove project - move repository and schedule it removal
- Improve group removing logic
- Trigger create-hooks on backup restore task
+ - Add option to automatically link omniauth and LDAP identities
v 7.11.4
- Fix missing bullets when creating lists