Skip to content

Commit

Permalink
Get rid of some deprecation warnings and update Changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosantoniodasilva committed Jul 7, 2010
1 parent fdb0cf1 commit cb990f2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.rdoc
@@ -1,3 +1,6 @@
* enhancements
* Extracted redirect path from Devise failure app to a new method, allowing override in custom failure apps

== 1.0.8

* enhancements
Expand Down
2 changes: 1 addition & 1 deletion test/models_test.rb
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/orm/active_record.rb
Expand Up @@ -8,7 +8,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion test/rails_app/app/active_record/admin.rb
@@ -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)
Expand Down
6 changes: 3 additions & 3 deletions test/rails_app/app/active_record/user.rb
@@ -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

0 comments on commit cb990f2

Please sign in to comment.