3 commits

Author	SHA1	Message	Date
Raphael Sofaer	9797e04957	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change ... Conflicts: app/controllers/users_controller.rb config/locales/diaspora/en.yml db/schema.rb spec/controllers/users_controller_spec.rb spec/mailers/notifier_spec.rb	2011-07-19 10:44:00 -07:00
Sebastian	ea85daadc4	Added UsersController#confirm_email with route and some specs	2011-06-01 16:26:54 +02:00
Sebastian	37ccbce153	Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update	2011-06-01 16:26:53 +02:00