delta/gitlab/gitlab-ce.git/spec/services/emails, branch docs/edit-rules-docs gitlab.com: gitlab-org/gitlab-ce.git Add frozen_string_literal to spec/services 2019-04-11T22:14:54+00:00 Thong Kuah tkuah@gitlab.com 2019-04-11T12:17:24+00:00 85b29c1c2fa3b94d7371cf454c485457a0756cb1 Probably useful as we often move these files to "new" files. 
Probably useful as we often move these files to "new" files.
Freeze strings in email service specs 2019-03-22T14:56:06+00:00 Sean McGivern sean@gitlab.com 2019-03-22T14:56:06+00:00 a01c738e1bb584fabf3a2dcdd9500f5543043f3e 






Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
2017-10-05T10:48:22+00:00

Douwe Maan
douwe@selenight.nl

2017-10-05T10:48:22+00:00

0c0c2ecd99cd5c4cb22a0c045f8d45d315203832

# 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





# 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







refactor emails service
2017-09-28T06:46:39+00:00

James Lopez
james@jameslopez.es

2017-09-27T14:39:10+00:00

1dcb7111107ed5a6b6258613d804b8da56af8b35












fix specs
2017-09-28T06:46:39+00:00

James Lopez
james@jameslopez.es

2017-09-20T11:36:00+00:00

f2e9ef102713344938e425d68d1a017403a710e0












when a primary email is replaced and added to the secondary emails list,
2017-09-23T13:24:53+00:00

Brett Walker
brett@digitalmoksha.com

2017-09-13T13:02:27+00:00

85d2bf778a72f82b10f4bb6ebddc3cedf8ce4e4e

make sure it stays confirmed





make sure it stays confirmed







optimized the email services
2017-09-23T13:24:53+00:00

Brett Walker
brett@digitalmoksha.com

2017-09-12T15:36:59+00:00

30e3a49e23f8ce0c2a07b13addc45951d7fc6719












tweaks for rubocop
2017-09-23T13:23:11+00:00

Brett Walker
brett@digitalmoksha.com

2017-09-09T16:32:27+00:00

d2267beb8916de5003e06b8764f209508fca989f












add verified/unverified labels to profile emails.
2017-09-23T13:23:11+00:00

Brett Walker
brett@digitalmoksha.com

2017-09-09T13:55:07+00:00

cf8a5bcaec99cc197ff556793febb8317e1db220

added "Resend confirmation email" for unverified emails





added "Resend confirmation email" for unverified emails







Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true
2017-07-27T12:31:53+00:00

Rémy Coutable
remy@rymai.me

2017-07-10T14:24:02+00:00

ddccd24c1388dadc057ac3c4c0a49f3fea847292

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>