summaryrefslogtreecommitdiff
path: root/config/initializers/devise.rb
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2012-07-05 23:50:24 -0700
committerNihad Abbasov <narkoz.2008@gmail.com>2012-07-05 23:50:24 -0700
commit2abd054b0c3c3f1116840cf51444fc63e49057f6 (patch)
treeeb372bdd01a68ff2405166230e63cf253710973f /config/initializers/devise.rb
parent7f207d4a872cb55d302608a2739e94fc59ef1ff1 (diff)
downloadgitlab-ce-2abd054b0c3c3f1116840cf51444fc63e49057f6.tar.gz
update devise
Diffstat (limited to 'config/initializers/devise.rb')
-rw-r--r--config/initializers/devise.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index cb1ae0ac0be..a778be5f929 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -93,10 +93,6 @@ Devise.setup do |config|
# If true, extends the user's remember period when remembered via cookie.
# config.extend_remember_period = false
- # If true, uses the password salt as remember token. This should be turned
- # to false if you are not using database authenticatable.
- config.use_salt_as_remember_token = true
-
# Options to be passed to the created cookie. For instance, you can set
# :secure => true in order to force SSL only cookies.
# config.cookie_options = {}
@@ -160,9 +156,9 @@ Devise.setup do |config|
# Defines name of the authentication token params key
config.token_authentication_key = :private_token
- # If true, authentication through token does not store user in session and needs
+ # Authentication through token does not store user in session and needs
# to be supplied on each request. Useful if you are using the token as API token.
- config.stateless_token = true
+ config.skip_session_storage << :token_auth
# ==> Scopes configuration
# Turn scoped views on. Before rendering "sessions/new", it will first check for