delta/gitlab/gitlab-ce.git/app/views/devise/mailer, branch docs-pages-https

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

Changed account confirmation line to e-mail text. This MR fixes issue #13637

2017-09-28T00:16:36+00:00

added changelog

fix whitespace

2017-09-24T20:21:00+00:00

small cleanup changes based on feedback

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

move #cta properly under #content

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

refactored the account confirmation into a partial. Also made the

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

text in the `.text` version consistent with the `.html` version

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

use common devise layout and use heading style

2017-06-13T20:36:45+00:00

use common layout for devise mailer

2017-06-13T20:36:45+00:00

Customize the Devise `unlock_instructions` email

2016-06-17T00:10:52+00:00