diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 48468fb1e..c8122e8d6 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -14,7 +14,6 @@ class RegistrationsController < Devise::RegistrationsController user = nil flash[:error] = e.message end - puts user if user #set_flash_message :notice, :signed_up flash[:notice] = "You've joined Diaspora!" diff --git a/app/models/user.rb b/app/models/user.rb index f71fdf428..eeab16653 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -50,7 +50,6 @@ class User ######## Making things work ######## key :email, String - ensure_index :email def method_missing(method, *args) self.person.send(method, *args) diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index 56781ca3d..f3be616c7 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -21,7 +21,7 @@ def create backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i # Create seed user username = backer_info[backer_number]['username'].gsub(/ /,'').downcase - user = User.create(:email => "#{username}@#{username}.joindiaspora.com", + user = User.instantiate!(:email => "#{username}@#{username}.joindiaspora.com", :username => username, :password => "#{username+backer_info[backer_number]['pin'].to_s}", :password_confirmation => "#{username+backer_info[backer_number]['pin'].to_s}",