Takuya Noguchi
|
ebcd5711c5
|
Replace time_ago_in_words with JS-based one
|
2018-04-27 08:35:45 +09:00 |
|
Douwe Maan
|
0c0c2ecd99
|
Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
# Conflicts:
# app/controllers/admin/users_controller.rb
# app/controllers/confirmations_controller.rb
# app/controllers/profiles/emails_controller.rb
# app/models/user.rb
# app/services/emails/base_service.rb
# app/services/emails/destroy_service.rb
# app/views/devise/mailer/confirmation_instructions.html.haml
# lib/api/users.rb
# spec/services/emails/destroy_service_spec.rb
|
2017-10-05 12:48:22 +02:00 |
|
bitsapien
|
714c062b38
|
Changed account confirmation line to e-mail text. This MR fixes issue #13637
added changelog
|
2017-09-28 05:46:36 +05:30 |
|
Brett Walker
|
39fbac8681
|
fix whitespace
|
2017-09-24 22:21:00 +02:00 |
|
Brett Walker
|
09726bdf44
|
small cleanup changes based on feedback
|
2017-09-23 15:24:53 +02:00 |
|
Brett Walker
|
a6045df701
|
move #cta properly under #content
|
2017-09-23 15:23:11 +02:00 |
|
Brett Walker
|
b1e68922a4
|
refactored the account confirmation into a partial. Also made the
text in the `.text` version consistent with the `.html` version
|
2017-09-23 15:23:11 +02:00 |
|
Brett Walker
|
f9f4672275
|
Send a confirmation email when the user adds a secondary email address. Utilizes the Devise `confirmable` capabilities. Issue #37385
|
2017-09-23 15:23:11 +02:00 |
|
Alexis Reigel
|
a3bd6ce8a3
|
use common devise layout and use heading style
|
2017-06-13 22:36:45 +02:00 |
|
Alexis Reigel
|
b0e0bfc8e7
|
use common layout for devise mailer
|
2017-06-13 22:36:45 +02:00 |
|
Robert Speicher
|
933cd3478d
|
Customize the Devise `unlock_instructions` email
|
2016-06-16 20:10:52 -04:00 |
|
Robert Speicher
|
3a5315d3ce
|
Customize the Devise `reset_password_instructions` email
|
2016-06-16 20:10:52 -04:00 |
|
Robert Speicher
|
dd1f56b5c4
|
Customize the Devise `password_change` emails
|
2016-06-16 20:10:52 -04:00 |
|
Robert Speicher
|
3e3463218d
|
New confirmation email 🔥
|
2016-05-25 16:56:06 -04:00 |
|
Robert Speicher
|
66ae3897e2
|
Make the standard Devise confirmation email our new plaintext version
|
2016-05-25 16:56:06 -04:00 |
|
Drew Blessing
|
be41d84fb0
|
Allow account unlock via email
|
2015-12-14 15:35:02 -06:00 |
|
Dmitriy Zaporozhets
|
9e554a5223
|
Update views to single form of address. Change "my" to "your"
|
2015-03-22 20:10:12 -07:00 |
|
Marin Jankovski
|
108be8a666
|
Update to accomodate devise deprecations and backward incompatible changes.
|
2014-07-10 13:56:35 +02:00 |
|
Dmitriy Zaporozhets
|
687cf48e60
|
Improve email with confirmation instructions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2013-12-16 21:10:18 +02:00 |
|
Andrey Kumanyaev
|
67ccc8b52a
|
Replace old hashes with new 1.9 ruby hashes (rebase)
|
2013-05-05 18:01:10 +04:00 |
|
gitlabhq
|
9ba1224867
|
init commit
|
2011-10-09 00:36:38 +03:00 |