delta/gitlab/gitlab-ce.git/app/controllers/profiles/emails_controller.rb, branch ide-diff-cursor

Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails

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

# 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

spacing and small optimisations

2017-10-01T15:07:26+00:00

refactor emails service

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

refactor services to match EE signature

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

fixes for rubocop

2017-09-23T13:26:04+00:00

optimized the email services

2017-09-23T13:24:53+00:00

tweaks for rubocop

2017-09-23T13:23:11+00:00

add verified/unverified labels to profile emails.

2017-09-23T13:23:11+00:00

added "Resend confirmation email" for unverified emails

Send a confirmation email when the user adds a secondary email address. Utilizes the Devise `confirmable` capabilities. Issue #37385

2017-09-23T13:23:11+00:00

Removes default scope from sortable

2017-09-07T12:01:59+00:00