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
..
_confirmation_instructions_account.html.haml	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
_confirmation_instructions_account.text.erb	refactored the account confirmation into a partial. Also made the	2017-09-23 15:23:11 +02:00
_confirmation_instructions_secondary.html.haml	move #cta properly under #content	2017-09-23 15:23:11 +02:00
_confirmation_instructions_secondary.text.erb	refactored the account confirmation into a partial. Also made the	2017-09-23 15:23:11 +02:00
confirmation_instructions.html.haml	Changed account confirmation line to e-mail text. This MR fixes issue #13637	2017-09-28 05:46:36 +05:30
confirmation_instructions.text.erb	small cleanup changes based on feedback	2017-09-23 15:24:53 +02:00
password_change.html.haml	use common devise layout and use heading style	2017-06-13 22:36:45 +02:00
password_change.text.erb	Customize the Devise password_change emails	2016-06-16 20:10:52 -04:00
reset_password_instructions.html.haml	use common devise layout and use heading style	2017-06-13 22:36:45 +02:00
reset_password_instructions.text.erb	Customize the Devise reset_password_instructions email	2016-06-16 20:10:52 -04:00
unlock_instructions.html.haml	use common devise layout and use heading style	2017-06-13 22:36:45 +02:00
unlock_instructions.text.erb	Customize the Devise unlock_instructions email	2016-06-16 20:10:52 -04:00