Merge branch 'master' of github.com:diaspora/diaspora
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/models/album.rb 0 ajout, 1 suppressionapp/models/album.rb
- app/models/photo.rb 14 ajouts, 5 suppressionsapp/models/photo.rb
- app/uploaders/image_uploader.rb 2 ajouts, 2 suppressionsapp/uploaders/image_uploader.rb
- app/views/albums/_album.html.haml 1 ajout, 1 suppressionapp/views/albums/_album.html.haml
- app/views/albums/edit.html.haml 1 ajout, 1 suppressionapp/views/albums/edit.html.haml
- app/views/albums/show.html.haml 1 ajout, 1 suppressionapp/views/albums/show.html.haml
- app/views/photos/show.html.haml 1 ajout, 1 suppressionapp/views/photos/show.html.haml
- app/views/users/edit.html.haml 3 ajouts, 3 suppressionsapp/views/users/edit.html.haml
- config/initializers/carrierwave.rb 1 ajout, 5 suppressionsconfig/initializers/carrierwave.rb
- config/routes.rb 0 ajout, 2 suppressionsconfig/routes.rb
- spec/factories.rb 1 ajout, 1 suppressionspec/factories.rb
- spec/fixtures/bp.jpeg 0 ajout, 0 suppressionspec/fixtures/bp.jpeg
- spec/fixtures/button.png 0 ajout, 0 suppressionspec/fixtures/button.png
- spec/models/album_spec.rb 1 ajout, 1 suppressionspec/models/album_spec.rb
- spec/models/photo_spec.rb 4 ajouts, 5 suppressionsspec/models/photo_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter