devise.rb in locomotive_cms-0.0.4.beta1

- old
+ new

@@ -61,11 +61,11 @@
   # Define which will be the encryption algorithm. Supported algorithms are :sha1
   # (default), :sha512 and :bcrypt. Devise also supports encryptors from others
   # authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set
   # stretches above to 20 for default behavior) and :restful_authentication_sha1
   # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha1
+  config.encryptor = :sha1
 
   # ==> Configuration for :confirmable
   # The time you want give to your user to confirm his account. During this time
   # he will be able to access your application without confirming. Default is nil.
   # config.confirm_within = 2.days
@@ -110,25 +110,19 @@
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
 
   # ==> General configuration
   # Load and configure the ORM. Supports :active_record (default), :mongoid
-  # (requires mongo_ext installed) and :data_mapper (experimental).
+  # and :data_mapper (experimental).
   require 'active_support/core_ext/class/attribute'
   require 'devise/orm/mongoid'
 
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "sessions/users/new". It's turned off by default because it's slower if you
   # are using only default views.
   config.scoped_views = true
 
-  # By default, devise detects the role accessed based on the url. So whenever
-  # accessing "/users/sign_in", it knows you are accessing an User. This makes
-  # routes as "/sign_in" not possible, unless you tell Devise to use the default
-  # scope, setting true below.
-  config.use_default_scope = true
-
   # Configure the default scope used by Devise. By default it's the first devise
   # role declared in your routes.
   config.default_scope = :account
 
   # If you want to use other strategies, that are not (yet) supported by Devise,
@@ -141,6 +135,6 @@
   #     twitter.consumer_key  = <YOUR CONSUMER KEY>
   #     twitter.options :site => 'http://twitter.com'
   #   end
   #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
   # end
-end
\ No newline at end of file
+end