-
- Téléchargements
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts: spec/lib/message_handler_spec.rb spec/spec_helper.rb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/controllers/people_controller.rb 14 ajouts, 5 suppressionsapp/controllers/people_controller.rb
- app/models/user.rb 1 ajout, 1 suppressionapp/models/user.rb
- app/views/people/show.html.haml 36 ajouts, 10 suppressionsapp/views/people/show.html.haml
- config/locales/diaspora/en.yml 1 ajout, 0 suppressionconfig/locales/diaspora/en.yml
- lib/tasks/fixtures.rake 12 ajouts, 0 suppressionlib/tasks/fixtures.rake
- spec/controllers/albums_controller_spec.rb 2 ajouts, 2 suppressionsspec/controllers/albums_controller_spec.rb
- spec/controllers/aspects_controller_spec.rb 2 ajouts, 2 suppressionsspec/controllers/aspects_controller_spec.rb
- spec/controllers/photos_controller_spec.rb 1 ajout, 1 suppressionspec/controllers/photos_controller_spec.rb
- spec/controllers/publics_controller_spec.rb 3 ajouts, 3 suppressionsspec/controllers/publics_controller_spec.rb
- spec/controllers/requests_controller_spec.rb 1 ajout, 1 suppressionspec/controllers/requests_controller_spec.rb
- spec/controllers/services_controller_spec.rb 1 ajout, 1 suppressionspec/controllers/services_controller_spec.rb
- spec/controllers/sockets_controller_spec.rb 1 ajout, 1 suppressionspec/controllers/sockets_controller_spec.rb
- spec/controllers/status_message_controller_spec.rb 1 ajout, 1 suppressionspec/controllers/status_message_controller_spec.rb
- spec/controllers/users_controller_spec.rb 1 ajout, 1 suppressionspec/controllers/users_controller_spec.rb
- spec/factories.rb 10 ajouts, 6 suppressionsspec/factories.rb
- spec/fixtures/users.yaml 948 ajouts, 0 suppressionspec/fixtures/users.yaml
- spec/helper_methods.rb 46 ajouts, 11 suppressionsspec/helper_methods.rb
- spec/helpers/application_helper_spec.rb 1 ajout, 1 suppressionspec/helpers/application_helper_spec.rb
- spec/helpers/publics_helper_spec.rb 1 ajout, 1 suppressionspec/helpers/publics_helper_spec.rb
- spec/lib/diaspora/exporter_spec.rb 3 ajouts, 3 suppressionsspec/lib/diaspora/exporter_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter