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 |
|
James Lopez
|
1dcb711110
|
refactor emails service
|
2017-09-28 08:46:39 +02:00 |
|
James Lopez
|
f2e9ef1027
|
fix specs
|
2017-09-28 08:46:39 +02:00 |
|
Brett Walker
|
85d2bf778a
|
when a primary email is replaced and added to the secondary emails list,
make sure it stays confirmed
|
2017-09-23 15:24:53 +02:00 |
|
Brett Walker
|
30e3a49e23
|
optimized the email services
|
2017-09-23 15:24:53 +02:00 |
|
Brett Walker
|
d2267beb89
|
tweaks for rubocop
|
2017-09-23 15:23:11 +02:00 |
|
Brett Walker
|
cf8a5bcaec
|
add verified/unverified labels to profile emails.
added "Resend confirmation email" for unverified emails
|
2017-09-23 15:23:11 +02:00 |
|
Rémy Coutable
|
ddccd24c13
|
Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
2017-07-27 14:31:53 +02:00 |
|
James Lopez
|
efb3d5e70f
|
fix spec failures
|
2017-06-23 19:00:22 +02:00 |
|
James Lopez
|
0ee002c70e
|
more refactoring
|
2017-06-23 11:41:42 +02:00 |
|
James Lopez
|
ad44af2faa
|
fixed specs
|
2017-06-23 11:41:42 +02:00 |
|
James Lopez
|
cabbfe94fc
|
add more spec examples
|
2017-06-23 11:41:42 +02:00 |
|
James Lopez
|
3798e89459
|
add emails service specs
|
2017-06-23 11:41:42 +02:00 |