Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
Raphael 2010-08-25 11:35:56 -07:00
commit c3b75703ac
3 changed files with 4 additions and 2 deletions

View file

@ -7,7 +7,8 @@ user = User.instantiate!( :email => "tom@tom.joindiaspora.com",
:person => {
:email => "tom@tom.joindiaspora.com",
:url => remote_url,
:profile => { :first_name => "Alexander", :last_name => "Hamiltom" }}
:profile => { :first_name => "Alexander", :last_name => "Hamiltom",
:image_url => "http://tom.joindiaspora.com/images/user/tom.jpg"}}
)
user.person.save!
@ -16,7 +17,8 @@ user2 = User.instantiate!( :email => "korth@tom.joindiaspora.com",
:person => { :email => "korth@tom.joindiaspora.com",
:url => remote_url,
:profile => { :first_name => "Evan",
:last_name => "Korth"}})
:last_name => "Korth",
:image_url => "http://tom.joindiaspora.com/images/user/korth.jpg"}})
user2.person.save!

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

View file

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 128 KiB