nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Daniel Vincent Grippi 2010-09-15 15:55:45 -07:00
commit f0dad8c16a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -288,7 +288,7 @@ else
###Helpers############
def self.instantiate!( opts = {} )
opts[:person][:diaspora_handle] = opts[:email]
#opts[:person][:diaspora_handle] = opts[:email]
opts[:person][:serialized_key] = generate_key
User.create!(opts)
end

4
db/seeds/tom.rb
View file

@ -12,7 +12,7 @@ remote_url = "http://localhost:3000/"
user = User.instantiate!( :email => "tom@tom.joindiaspora.com",
:username => "tom",
:password => "evankorth",
:url=> "http://#{username}.joindiaspora.com/",
:url => remote_url,
:person => {
:diaspora_handle => "tom@tom.joindiaspora.com",
:url => remote_url,
@ -24,7 +24,7 @@ user.person.save!
user2 = User.instantiate!( :email => "korth@tom.joindiaspora.com",
:password => "evankorth",
:username => "korth",
:url=> "http://#{username}.joindiaspora.com/",
:url => remote_url,
:person => { :diaspora_handle => "korth@tom.joindiaspora.com",
:url => remote_url,
:profile => { :first_name => "Evan",