diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-26 21:11:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-26 21:11:17 +0300 |
commit | 51ba1dfa3bed95ec8c3fdee9b682a7941c4c34cc (patch) | |
tree | 9c59e7b5749341c43badbadf3685b1c51150d0f2 /config/initializers | |
parent | c86ec1d072338034a312bb4be0ff175892fa01b7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/8_devise.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb index 65314c4472f..237231f544f 100644 --- a/config/initializers/8_devise.rb +++ b/config/initializers/8_devise.rb @@ -178,14 +178,6 @@ Devise.setup do |config| # reset. Defaults to true, so a user is signed in automatically after a reset. config.sign_in_after_reset_password = false - # ==> Configuration for :encryptable - # Allow you to use another encryption algorithm besides bcrypt (default). You can use - # :sha1, :sha512 or 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 = :pbkdf2_sha512 - # 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.skip_session_storage << :token_auth |