summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-15 12:46:22 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-12-15 12:46:22 +0000
commitd39d968ba4100be3e77e9d02af6ce10ff18ca508 (patch)
tree9d4d9f4b756d4607cbd93b5bf4f74c0cdce06be7 /changelogs
parent3a19e532f51b4b52ec3e292921106f43f8db948e (diff)
parent481b8a71f8ee63758d26a57a6367c091d4b76b09 (diff)
downloadgitlab-ce-d39d968ba4100be3e77e9d02af6ce10ff18ca508.tar.gz
Merge branch 'dm-ldap-email-readonly' into 'master'
Make sure user email is read only when synced with LDAP Closes #41033 See merge request gitlab-org/gitlab-ce!15915
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/dm-ldap-email-readonly.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/dm-ldap-email-readonly.yml b/changelogs/unreleased/dm-ldap-email-readonly.yml
new file mode 100644
index 00000000000..744b21f901e
--- /dev/null
+++ b/changelogs/unreleased/dm-ldap-email-readonly.yml
@@ -0,0 +1,5 @@
+---
+title: Make sure user email is read only when synced with LDAP
+merge_request: 15915
+author:
+type: fixed