diff options
| author | Cindy Pallares <cindy@gitlab.com> | 2018-11-28 22:54:52 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-28 19:14:23 -0500 |
| commit | 82f455a8ca3ed366c25aa75e7f443b66a1693b07 (patch) | |
| tree | d3ce12764d8fbcb85b2d56e4f6f69cf2bb220902 /doc/workflow | |
| parent | 5736d6606ad7c6d729baa6c4ef789a47ada4ceda (diff) | |
| download | gitlab-ce-82f455a8ca3ed366c25aa75e7f443b66a1693b07.tar.gz | |
Merge branch 'security-email-change-notification' into 'master'
[master] Resolve: "Provide email notification when a user changes their email address"
See merge request gitlab/gitlabhq!2587
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/notifications.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index c590ac4b0ba..020aa73f809 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -64,6 +64,8 @@ Below is the table of events users can be notified of: |------------------------------|-------------------------------------------------------------------|------------------------------| | New SSH key added | User | Security email, always sent. | | New email added | User | Security email, always sent. | +| Email changed | User | Security email, always sent. | +| Password changed | User | Security email, always sent. | | New user created | User | Sent on user creation, except for omniauth (LDAP)| | User added to project | User | Sent when user is added to project | | Project access level changed | User | Sent when user project access level is changed | |