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
This commit is contained in:
parent
5736d6606a
commit
82f455a8ca
|
@ -0,0 +1,12 @@
|
||||||
|
= email_default_heading("Hello, #{@resource.name}!")
|
||||||
|
|
||||||
|
- if @resource.try(:unconfirmed_email?)
|
||||||
|
%p
|
||||||
|
We're contacting you to notify you that your email is being changed to #{@resource.reload.unconfirmed_email}.
|
||||||
|
- else
|
||||||
|
%p
|
||||||
|
We're contacting you to notify you that your email has been changed to #{@resource.email}.
|
||||||
|
|
||||||
|
%p
|
||||||
|
If you did not initiate this change, please contact your administrator
|
||||||
|
immediately.
|
|
@ -0,0 +1,10 @@
|
||||||
|
Hello, <%= @resource.name %>!
|
||||||
|
|
||||||
|
<% if @resource.try(:unconfirmed_email?) %>
|
||||||
|
We're contacting you to notify you that your email is being changed to <%= @resource.reload.unconfirmed_email %>.
|
||||||
|
<% else %>
|
||||||
|
We're contacting you to notify you that your email has been changed to <%= @resource.email %>.
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
If you did not initiate this change, please contact your administrator
|
||||||
|
immediately.
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Provide email notification when a user changes their email address
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: security
|
|
@ -103,6 +103,9 @@ Devise.setup do |config|
|
||||||
# Send a notification email when the user's password is changed
|
# Send a notification email when the user's password is changed
|
||||||
config.send_password_change_notification = true
|
config.send_password_change_notification = true
|
||||||
|
|
||||||
|
# Send a notification email when the user's email is changed
|
||||||
|
config.send_email_changed_notification = true
|
||||||
|
|
||||||
# ==> Configuration for :validatable
|
# ==> Configuration for :validatable
|
||||||
# Range for password length. Default is 6..128.
|
# Range for password length. Default is 6..128.
|
||||||
config.password_length = 8..128
|
config.password_length = 8..128
|
||||||
|
|
|
@ -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 SSH key added | User | Security email, always sent. |
|
||||||
| New email 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)|
|
| New user created | User | Sent on user creation, except for omniauth (LDAP)|
|
||||||
| User added to project | User | Sent when user is added to project |
|
| 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 |
|
| Project access level changed | User | Sent when user project access level is changed |
|
||||||
|
|
Loading…
Reference in New Issue