Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 1481056a.
parent
1481056a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .gitignore 1 ajout, 1 suppression.gitignore
- Gemfile 2 ajouts, 0 suppressionGemfile
- Gemfile.lock 18 ajouts, 18 suppressionsGemfile.lock
- app/controllers/aspects_controller.rb 2 ajouts, 1 suppressionapp/controllers/aspects_controller.rb
- app/controllers/registrations_controller.rb 5 ajouts, 4 suppressionsapp/controllers/registrations_controller.rb
- app/controllers/users_controller.rb 27 ajouts, 1 suppressionapp/controllers/users_controller.rb
- app/models/person.rb 8 ajouts, 0 suppressionapp/models/person.rb
- app/models/post.rb 1 ajout, 0 suppressionapp/models/post.rb
- app/models/profile.rb 9 ajouts, 0 suppressionapp/models/profile.rb
- app/models/user.rb 12 ajouts, 2 suppressionsapp/models/user.rb
- app/views/albums/_new_album.haml 10 ajouts, 8 suppressionsapp/views/albums/_new_album.haml
- app/views/aspects/_new_aspect.haml 11 ajouts, 7 suppressionsapp/views/aspects/_new_aspect.haml
- app/views/devise/mailer/confirmation_instructions.html.haml 51 ajouts, 4 suppressionsapp/views/devise/mailer/confirmation_instructions.html.haml
- app/views/devise/mailer/invitation.html.haml 61 ajouts, 16 suppressionsapp/views/devise/mailer/invitation.html.haml
- app/views/devise/mailer/reset_password_instructions.html.haml 53 ajouts, 6 suppressions...views/devise/mailer/reset_password_instructions.html.haml
- app/views/devise/mailer/unlock_instructions.html.haml 52 ajouts, 5 suppressionsapp/views/devise/mailer/unlock_instructions.html.haml
- app/views/invitations/_new.haml 18 ajouts, 13 suppressionsapp/views/invitations/_new.haml
- app/views/people/show.html.haml 2 ajouts, 0 suppressionapp/views/people/show.html.haml
- app/views/registrations/new.html.haml 24 ajouts, 0 suppressionapp/views/registrations/new.html.haml
- app/views/requests/_new_request.haml 15 ajouts, 13 suppressionsapp/views/requests/_new_request.haml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter