Get rid of some deprecation warnings and update Changelog

This commit is contained in:
Carlos Antonio da Silva
2010-07-07 00:10:28 -03:00
parent fdb0cf11bb
commit cb990f2d28
5 changed files with 9 additions and 6 deletions

View File

@@ -1,7 +1,7 @@
require 'test/test_helper'
class Configurable < User
devise :authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
:stretches => 15, :pepper => 'abcdef', :confirm_within => 5.days,
:remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
end

View File

@@ -8,7 +8,7 @@ ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":me
ActiveRecord::Schema.define(:version => 1) do
[:users, :admins, :accounts].each do |table|
create_table table do |t|
t.authenticatable :null => table == :admins
t.database_authenticatable :null => table == :admins
if table != :admin
t.string :username

View File

@@ -1,5 +1,5 @@
class Admin < ActiveRecord::Base
devise :authenticatable, :registerable, :timeoutable
devise :database_authenticatable, :registerable, :timeoutable
def self.find_for_authentication(conditions)
last(:conditions => conditions)

View File

@@ -1,7 +1,7 @@
class User < ActiveRecord::Base
devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
:registerable, :rememberable, :timeoutable, :token_authenticatable,
:trackable, :validatable
devise :database_authenticatable, :http_authenticatable, :confirmable,
:lockable, :recoverable, :registerable, :rememberable, :timeoutable,
:token_authenticatable, :trackable, :validatable
attr_accessible :username, :email, :password, :password_confirmation
end