summaryrefslogtreecommitdiff
path: root/config/initializers/devise.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-10 16:27:26 +0100
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-10 16:27:26 +0100
commit82d2e5c3c561f213a59c1df36c6d5c4bb2eef7d0 (patch)
tree0e6e0efcc6dc6ff1b517c82fb3b2a86cf78e8e4f /config/initializers/devise.rb
parent5fd280f3d3264aec3656cb61cd8728f2ca4d61ce (diff)
parent4e5897f51ef97d7c3ff6c57f81521f552979a3da (diff)
downloadgitlab-ce-82d2e5c3c561f213a59c1df36c6d5c4bb2eef7d0.tar.gz
Merge branch 'master' into copying-file-seen-as-licence
Diffstat (limited to 'config/initializers/devise.rb')
-rw-r--r--config/initializers/devise.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 29506970af2..5fb43a86e13 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -60,7 +60,7 @@ Devise.setup do |config|
# It will change confirmation, password recovery and other workflows
# to behave the same regardless if the e-mail provided was right or wrong.
# Does not affect registerable.
- # config.paranoid = true
+ config.paranoid = true
# ==> Configuration for :database_authenticatable
# For bcrypt, this is the cost for hashing the password and defaults to 10. If