gitlab-org--gitlab-foss/app/models/ci
Robert Speicher 7d33fba7af 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
2016-06-02 00:44:41 +00:00
..
build.rb Enable Style/MethodDefParentheses rubocop cop 2016-05-30 12:08:53 +02:00
commit.rb Pipelines can be canceled only when there are running builds 2016-05-31 15:26:00 +02:00
runner.rb Enable Style/NegatedIf Rubocop cop 2016-05-30 13:53:25 +02:00
runner_project.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
trigger.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
trigger_request.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
variable.rb Upgrade attr_encrypted and encryptor 2016-05-30 13:51:21 -06:00