-
Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails · 0c0c2ecdDouwe Maan authored
# 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
0c0c2ecd