summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-11-27 12:37:54 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-11-27 12:37:54 +0000
commit92bfb3c5be8ce9b034421040cadc23fe067e5c4b (patch)
tree9a542e5a33984f839dd752bda0ec8649fa48dbe9 /changelogs
parent397fd09ac4ba7353580f4d3a88c80105d51ff47a (diff)
parenta937eabe4c0769de881a54867d0e42b3bed4be35 (diff)
downloadgitlab-ce-92bfb3c5be8ce9b034421040cadc23fe067e5c4b.tar.gz
Merge branch 'if-ce-54109-fix_user_by_any_email' into 'master'
User#find_by_any_email to respect confirmed flag on secondary emails See merge request gitlab-org/gitlab-ce!23181
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/ce-54109-fix_user_by_any_email.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/ce-54109-fix_user_by_any_email.yml b/changelogs/unreleased/ce-54109-fix_user_by_any_email.yml
new file mode 100644
index 00000000000..eb5d2e3244c
--- /dev/null
+++ b/changelogs/unreleased/ce-54109-fix_user_by_any_email.yml
@@ -0,0 +1,5 @@
+---
+title: Respect confirmed flag on secondary emails
+merge_request: 23181
+author:
+type: fixed