-
- Downloads
There was a problem fetching the pipeline summary.
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
Showing
- Gemfile 3 additions, 4 deletionsGemfile
- Gemfile.lock 15 additions, 19 deletionsGemfile.lock
- app/controllers/application_controller.rb 1 addition, 1 deletionapp/controllers/application_controller.rb
- app/models/ci/variable.rb 4 additions, 1 deletionapp/models/ci/variable.rb
- app/models/project_import_data.rb 2 additions, 1 deletionapp/models/project_import_data.rb
- app/models/user.rb 6 additions, 1 deletionapp/models/user.rb
- config/initializers/devise_async.rb 0 additions, 1 deletionconfig/initializers/devise_async.rb
- spec/controllers/sessions_controller_spec.rb 1 addition, 1 deletionspec/controllers/sessions_controller_spec.rb
- spec/features/login_spec.rb 1 addition, 1 deletionspec/features/login_spec.rb
- spec/models/ci/variable_spec.rb 1 addition, 1 deletionspec/models/ci/variable_spec.rb
Loading
Please register or sign in to comment