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
Affichage de
- app/controllers/users_controller.rb 17 ajouts, 0 suppressionapp/controllers/users_controller.rb
- app/mailers/notifier.rb 10 ajouts, 0 suppressionapp/mailers/notifier.rb
- app/models/jobs/mail_confirm_email.rb 8 ajouts, 0 suppressionapp/models/jobs/mail_confirm_email.rb
- app/models/user.rb 22 ajouts, 0 suppressionapp/models/user.rb
- app/views/notifier/confirm_email.html.haml 6 ajouts, 0 suppressionapp/views/notifier/confirm_email.html.haml
- app/views/notifier/confirm_email.text.haml 4 ajouts, 0 suppressionapp/views/notifier/confirm_email.text.haml
- app/views/users/edit.html.haml 9 ajouts, 2 suppressionsapp/views/users/edit.html.haml
- config/locales/diaspora/en.yml 10 ajouts, 1 suppressionconfig/locales/diaspora/en.yml
- config/routes.rb 1 ajout, 0 suppressionconfig/routes.rb
- db/migrate/20110601083310_add_unconfirmed_email_to_users.rb 9 ajouts, 0 suppressiondb/migrate/20110601083310_add_unconfirmed_email_to_users.rb
- db/migrate/20110601091059_add_confirm_email_token_to_users.rb 9 ajouts, 0 suppression...igrate/20110601091059_add_confirm_email_token_to_users.rb
- db/schema.rb 2 ajouts, 0 suppressiondb/schema.rb
- spec/controllers/users_controller_spec.rb 62 ajouts, 0 suppressionspec/controllers/users_controller_spec.rb
- spec/mailers/notifier_spec.rb 29 ajouts, 1 suppressionspec/mailers/notifier_spec.rb
- spec/models/user_spec.rb 157 ajouts, 0 suppressionspec/models/user_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter