Remove unused options param for token_auth schema, and avoid creating a new hash

lib/devise/orm/mongoid.rb

@@ -16,7 +16,7 @@ module Devise
         # Tell how to apply schema methods
         def apply_devise_schema(name, type, options={})
           type = Time if type == DateTime
-          field name, { :type => type }.merge(options)
+          field name, { :type => type }.merge!(options)
         end
       end
     end

lib/devise/schema.rb

@@ -26,7 +26,7 @@ module Devise
     end
 
     # Creates authentication_token.
-    def token_authenticatable(options={})
+    def token_authenticatable
       apply_devise_schema :authentication_token, String
     end
 

test/rails_app/lib/shared_admin.rb

@@ -2,6 +2,8 @@ module SharedAdmin
   extend ActiveSupport::Concern
 
   included do
-    devise :database_authenticatable, :encryptable, :registerable, :timeoutable, :recoverable, :rememberable, :lockable, :unlock_strategy => :time
+    devise :database_authenticatable, :encryptable, :registerable,
+           :timeoutable, :recoverable, :rememberable, :lockable,
+           :unlock_strategy => :time
   end
 end