diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-02 00:44:41 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-02 00:44:41 +0000 |
| commit | 7d33fba7af94667311ab9a7d7d7041ed72ba3937 (patch) | |
| tree | 2b143bd437e6769796de65fd6ed2c3ed0e0861b6 /app/controllers/application_controller.rb | |
| parent | 3b53016f5978164ceb6b604d9ee84a7d479add0e (diff) | |
| parent | 5647fb14b6d638bb168014e997ecd2d29175249f (diff) | |
| download | gitlab-ce-7d33fba7af94667311ab9a7d7d7041ed72ba3937.tar.gz | |
Merge branch 'upgrade-devise-two-factor' into 'master'
Upgrade devise, devise-two-factor, and attr_encrypted
Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support.
attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future.
See merge request !4216
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9b2a9d298b3..c28d1ca9e3b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -232,7 +232,7 @@ class ApplicationController < ActionController::Base end def configure_permitted_parameters - devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email, :password, :login, :remember_me, :otp_attempt) } + devise_parameter_sanitizer.permit(:sign_in, keys: [:username, :email, :password, :login, :remember_me, :otp_attempt]) end def hexdigest(string) |