Extract Activatable from Confirmable, so if you need to active your account through other means, you can still do so and ensure cherry pick works as expected.

test/rails_app/app/models/admin.rb

@@ -1,5 +1,5 @@
 class Admin < ActiveRecord::Base
-  devise :all, :except => [:recoverable, :confirmable, :rememberable, :validatable, :trackable]
+  devise :all, :timeoutable, :except => [:recoverable, :confirmable, :rememberable, :validatable, :trackable]
 
   def self.find_for_authentication(conditions)
     last(:conditions => conditions)

test/rails_app/app/models/user.rb

@@ -1,4 +1,4 @@
 class User < ActiveRecord::Base
-  devise :all
+  devise :all, :timeoutable
   attr_accessible :username, :email, :password, :password_confirmation
 end