Commit Graph

21 Commits

Author SHA1 Message Date
GitLab Bot 4e86ca506d Add latest changes from gitlab-org/gitlab@master 2021-11-04 00:12:36 +00:00
GitLab Bot 63324f9cfd Add latest changes from gitlab-org/gitlab@master 2020-10-21 15:10:28 +00:00
GitLab Bot 4c5468b408 Add latest changes from gitlab-org/gitlab@master 2020-06-24 15:08:50 +00:00
GitLab Bot 1b9a2ce278 Add latest changes from gitlab-org/gitlab@master 2020-05-18 09:08:12 +00:00
GitLab Bot e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot 6ac4a6713e Add latest changes from gitlab-org/gitlab@master 2020-03-27 09:08:28 +00:00
Thong Kuah 85b29c1c2f Add frozen_string_literal to spec/services
Probably useful as we often move these files to "new" files.
2019-04-12 10:14:54 +12:00
Sean McGivern a01c738e1b Freeze strings in email service specs 2019-03-22 14:56:06 +00: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
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