From b3034292f21b401fe873f720775c8ee41b9638bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 1 Dec 2011 10:13:24 +0100
Subject: [PATCH] Ensure admin is running with manual lock strategy.

---
 test/rails_app/db/migrate/20100401102949_create_tables.rb | 2 +-
 test/rails_app/lib/shared_admin.rb                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/rails_app/db/migrate/20100401102949_create_tables.rb b/test/rails_app/db/migrate/20100401102949_create_tables.rb
index aa8ecd3a..6279e919 100644
--- a/test/rails_app/db/migrate/20100401102949_create_tables.rb
+++ b/test/rails_app/db/migrate/20100401102949_create_tables.rb
@@ -19,7 +19,7 @@ class CreateTables < ActiveRecord::Migration
       t.encryptable
       t.rememberable :use_salt => false
       t.recoverable
-      t.lockable
+      t.lockable :lock_strategy => :none, :unlock_strateagy => :time
       t.timestamps
     end
   end
diff --git a/test/rails_app/lib/shared_admin.rb b/test/rails_app/lib/shared_admin.rb
index 0e608a77..f92a1822 100644
--- a/test/rails_app/lib/shared_admin.rb
+++ b/test/rails_app/lib/shared_admin.rb
@@ -4,7 +4,7 @@ module SharedAdmin
   included do
     devise :database_authenticatable, :encryptable, :registerable,
            :timeoutable, :recoverable, :rememberable, :lockable,
-           :unlock_strategy => :time
+           :unlock_strategy => :time, :lock_strategy => :none
   end
 
 end