From 085b12a7101d9f9782f0a9ddce9e8c6a446ffa4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 15 Feb 2010 13:59:36 +0100 Subject: [PATCH] Add registerable to defaults. --- generators/devise/templates/model.rb | 3 ++- lib/devise/models/authenticatable.rb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/devise/templates/model.rb b/generators/devise/templates/model.rb index 39334ebc..7032df95 100644 --- a/generators/devise/templates/model.rb +++ b/generators/devise/templates/model.rb @@ -1,7 +1,8 @@ class <%= class_name %> < ActiveRecord::Base # Include default devise modules. # Others available are :lockable, :timeoutable and :activatable. - devise :authenticatable, :confirmable, :recoverable, :rememberable, :trackable, :validatable + devise :registerable, :authenticatable, :confirmable, :recoverable, + :rememberable, :trackable, :validatable # Setup accessible (or protected) attributes for your model attr_accessible :email, :password, :password_confirmation diff --git a/lib/devise/models/authenticatable.rb b/lib/devise/models/authenticatable.rb index 77b8f47a..44342cc4 100644 --- a/lib/devise/models/authenticatable.rb +++ b/lib/devise/models/authenticatable.rb @@ -145,7 +145,6 @@ module Devise def find_for_authentication(conditions) find(:first, :conditions => conditions) end - end end end