From 0f7b311171af3eb745a56c72ddde38f0f105a233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 2 Apr 2010 20:36:27 +0200 Subject: [PATCH] Add lockable to migration. --- lib/devise.rb | 2 +- lib/generators/devise/templates/migration.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/devise.rb b/lib/devise.rb index 795e2112..b5dc3c0c 100644 --- a/lib/devise.rb +++ b/lib/devise.rb @@ -189,7 +189,7 @@ module Devise # def self.add_module(module_name, options = {}) ALL << module_name - options.assert_valid_keys(:strategy, :model, :controller, :route, :flash, :passive_strategy) + options.assert_valid_keys(:strategy, :model, :controller, :route, :flash) config = { :strategy => STRATEGIES, diff --git a/lib/generators/devise/templates/migration.rb b/lib/generators/devise/templates/migration.rb index 1bbb5d75..81c6b796 100644 --- a/lib/generators/devise/templates/migration.rb +++ b/lib/generators/devise/templates/migration.rb @@ -6,7 +6,7 @@ class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration t.recoverable t.rememberable t.trackable - # t.lockable :unlock_strategy => :<%= Devise.unlock_strategy %> + # t.lockable :lock_strategy => :<%= Devise.lock_strategy %>, :unlock_strategy => :<%= Devise.unlock_strategy %> t.timestamps end