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
..
confirmations	…
mailer	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
passwords	…
registrations	…
sessions	Fixes needed when GitLab sign-in is not enabled	2017-07-13 10:08:27 -04:00
shared	Add missing classes to omniauth remember-me checkbox and add correct font-size	2017-09-14 17:58:15 +00:00
unlocks	…