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
..
base_service.rb	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
confirm_service.rb
create_service.rb
destroy_service.rb	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00