1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00

Get rid of deprecation warnings.

This commit is contained in:
José Valim 2010-04-15 08:43:39 +02:00
parent 731f156f50
commit b9c0676a01
8 changed files with 8 additions and 9 deletions

View file

@ -1,7 +1,7 @@
require '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

@ -1,3 +1,3 @@
class Admin < ActiveRecord::Base
devise :authenticatable, :registerable, :timeoutable, :recoverable
devise :database_authenticatable, :registerable, :timeoutable, :recoverable
end

View file

@ -1,5 +1,5 @@
class User < ActiveRecord::Base
devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
devise :database_authenticatable, :confirmable, :lockable, :recoverable,
:registerable, :rememberable, :timeoutable, :token_authenticatable,
:trackable, :validatable

View file

@ -4,10 +4,9 @@ class Admin
property :id, Serial
property :username, String
devise :authenticatable, :registerable, :timeoutable, :recoverable
devise :database_authenticatable, :registerable, :timeoutable, :recoverable
def self.create!(*args)
create(*args)
end
end

View file

@ -4,7 +4,7 @@ class User
property :id, Serial
property :username, String
devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
devise :database_authenticatable, :confirmable, :lockable, :recoverable,
:registerable, :rememberable, :timeoutable, :token_authenticatable,
:trackable, :validatable

View file

@ -1,7 +1,7 @@
class Admin
include Mongoid::Document
devise :authenticatable, :timeoutable, :registerable, :recoverable
devise :database_authenticatable, :timeoutable, :registerable, :recoverable
def self.last(options={})
options.delete(:order) if options[:order] == "id"

View file

@ -3,7 +3,7 @@ class User
field :created_at, :type => DateTime
devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
devise :database_authenticatable, :confirmable, :lockable, :recoverable,
:registerable, :rememberable, :timeoutable, :token_authenticatable,
:trackable, :validatable

View file

@ -2,7 +2,7 @@ class CreateTables < ActiveRecord::Migration
def self.up
[: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