GitLab Bot
b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
Rémy Coutable
eafe834c3d
Reduce remaining diff with EE in app/services
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-14 12:37:55 +01:00
Stan Hu
ced2a932d7
Add ability to skip user email confirmation with API
...
This gives admins the ability to send a `skip_confirmation` flag in the
`POST /users/:id/email` API endpoint to skip the verification step and
assume the given e-mail address is verified.
Closes #50876
2018-09-10 22:41:53 -07:00
gfyoung
265478ad74
Enable frozen string in apps/services/**/*.rb
...
For directories application_settings --> labels.
Partially addresses #47424 .
2018-07-16 12:36:41 -07: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
Alexandra
ed3c25e429
spacing and small optimisations
2017-10-01 17:07:26 +02:00
James Lopez
1dcb711110
refactor emails service
2017-09-28 08:46:39 +02:00
James Lopez
67d06dee30
refactor users update service
2017-09-28 08:46:39 +02:00
James Lopez
7188975cb5
update initializers
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
a32f1dddf2
fixes for rubocop
2017-09-23 15:26:04 +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
cf8a5bcaec
add verified/unverified labels to profile emails.
...
added "Resend confirmation email" for unverified emails
2017-09-23 15:23:11 +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
831b2fccf9
update missing email actions
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