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 |
|
Alexandra
|
ed3c25e429
|
spacing and small optimisations
|
2017-10-01 17:07:26 +02:00 |
|
James Lopez
|
67d06dee30
|
refactor users update service
|
2017-09-28 08:46:39 +02:00 |
|
James Lopez
|
9621dd0c9d
|
refactor services to match EE signature
|
2017-09-28 08:46:39 +02:00 |
|
Brett Walker
|
30e3a49e23
|
optimized the email services
|
2017-09-23 15:24:53 +02:00 |
|
James Lopez
|
8f2adb8084
|
fix bug in emails destroy service
|
2017-06-23 16:44:34 +02:00 |
|
James Lopez
|
b804db2648
|
refactor update user service not to do auth checks
|
2017-06-23 11:41:43 +02:00 |
|
James Lopez
|
c9fd3dc42c
|
more refactoring based on feedback
|
2017-06-23 11:41:42 +02:00 |
|
James Lopez
|
785cbb79e2
|
refactor emails service
|
2017-06-23 11:41:42 +02:00 |
|
James Lopez
|
87bf08c96c
|
fix specs
|
2017-06-23 11:41:42 +02:00 |
|
James Lopez
|
3bab585bec
|
update to use emails destroy service
|
2017-06-23 11:41:42 +02:00 |
|
James Lopez
|
7aaf3692b3
|
add create and destroy services for emails
|
2017-06-23 11:41:42 +02:00 |
|