diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-02 03:44:41 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-02 03:44:41 +0300 |
| commit | 7d33fba7af94667311ab9a7d7d7041ed72ba3937 (patch) | |
| tree | 2b143bd437e6769796de65fd6ed2c3ed0e0861b6 /Gemfile | |
| parent | 3b53016f5978164ceb6b604d9ee84a7d479add0e (diff) | |
| parent | 5647fb14b6d638bb168014e997ecd2d29175249f (diff) | |
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 'Gemfile')
| -rw-r--r-- | Gemfile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -18,9 +18,8 @@ gem "mysql2", '~> 0.3.16', group: :mysql gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries -gem 'devise', '~> 3.5.4' +gem 'devise', '~> 4.0' gem 'doorkeeper', '~> 3.1' -gem 'devise-async', '~> 0.9.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' @@ -43,9 +42,9 @@ gem 'recaptcha', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' # Two-factor authentication -gem 'devise-two-factor', '~> 2.0.0' +gem 'devise-two-factor', '~> 3.0.0' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 1.3.4' +gem 'attr_encrypted', '~> 3.0.0' # Browser detection gem "browser", '~> 1.0.0' |