Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
dd88eb0c
Commit
dd88eb0c
authored
Nov 06, 2018
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Provide email notification on email updates
parent
6e9179ab
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
0 deletions
+32
-0
app/views/devise/mailer/email_changed.html.haml
app/views/devise/mailer/email_changed.html.haml
+12
-0
app/views/devise/mailer/email_changed.text.erb
app/views/devise/mailer/email_changed.text.erb
+10
-0
changelogs/unreleased/security-email-change-notification.yml
changelogs/unreleased/security-email-change-notification.yml
+5
-0
config/initializers/devise.rb
config/initializers/devise.rb
+3
-0
doc/workflow/notifications.md
doc/workflow/notifications.md
+2
-0
No files found.
app/views/devise/mailer/email_changed.html.haml
0 → 100644
View file @
dd88eb0c
=
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.
app/views/devise/mailer/email_changed.text.erb
0 → 100644
View file @
dd88eb0c
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.
changelogs/unreleased/security-email-change-notification.yml
0 → 100644
View file @
dd88eb0c
---
title
:
Provide email notification when a user changes their email address
merge_request
:
author
:
type
:
security
config/initializers/devise.rb
View file @
dd88eb0c
...
...
@@ -103,6 +103,9 @@ Devise.setup do |config|
# Send a notification email when the user's password is changed
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
# Range for password length. Default is 6..128.
config
.
password_length
=
8
..
128
...
...
doc/workflow/notifications.md
View file @
dd88eb0c
...
...
@@ -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 |
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment