Merge branch 'import'
Conflicts: spec/models/user/invite_spec.rb
Affichage de
- Gemfile 2 ajouts, 0 suppressionGemfile
- Gemfile.lock 14 ajouts, 7 suppressionsGemfile.lock
- app/controllers/registrations_controller.rb 1 ajout, 1 suppressionapp/controllers/registrations_controller.rb
- app/controllers/users_controller.rb 27 ajouts, 1 suppressionapp/controllers/users_controller.rb
- app/models/post.rb 1 ajout, 0 suppressionapp/models/post.rb
- app/models/user.rb 6 ajouts, 2 suppressionsapp/models/user.rb
- app/views/registrations/new.html.haml 24 ajouts, 0 suppressionapp/views/registrations/new.html.haml
- config/routes.rb 1 ajout, 0 suppressionconfig/routes.rb
- lib/diaspora/exporter.rb 34 ajouts, 19 suppressionslib/diaspora/exporter.rb
- lib/diaspora/importer.rb 179 ajouts, 0 suppressionlib/diaspora/importer.rb
- spec/lib/exporter_spec.rb 37 ajouts, 5 suppressionsspec/lib/exporter_spec.rb
- spec/lib/importer_spec.rb 234 ajouts, 0 suppressionspec/lib/importer_spec.rb
- spec/lib/verify_spec.rb 109 ajouts, 0 suppressionspec/lib/verify_spec.rb
- spec/models/aspect_spec.rb 1 ajout, 1 suppressionspec/models/aspect_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter