diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2021-04-10 11:50:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-10 11:50:41 +0200 |
| commit | b3e9094e14e0ed693173c66d3826d2d52a67a725 (patch) | |
| tree | c6deef1cf62aaeb99b4a1f8a6cb2cb54b22599d9 | |
| parent | 3f8d0de82e15f80f1dfbd4d93f721b2853538774 (diff) | |
Bump devise-two-factor from git to 4.0.0 (#15987)
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/Gemfile b/Gemfile index a813e82f2..cb24207ca 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'iso-639' gem 'chewy', '~> 5.2' gem 'cld3', '~> 3.4.1' gem 'devise', '~> 4.7' -gem 'devise-two-factor', git: 'https://github.com/ClearlyClaire/devise-two-factor', ref: '594bb8a32e6f94df7e5ba7c9399eaf9ff25bac0d' +gem 'devise-two-factor', '~> 4.0' group :pam_authentication, optional: true do gem 'devise_pam_authenticatable2', '~> 9.2' diff --git a/Gemfile.lock b/Gemfile.lock index fecaee7f5..11765a967 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,4 @@ GIT - remote: https://github.com/ClearlyClaire/devise-two-factor - revision: 594bb8a32e6f94df7e5ba7c9399eaf9ff25bac0d - ref: 594bb8a32e6f94df7e5ba7c9399eaf9ff25bac0d - specs: - devise-two-factor (3.1.0) - activesupport (< 7.0) - attr_encrypted (>= 1.3, < 4, != 2) - devise - railties (< 7.0) - rotp (~> 6) - -GIT remote: https://github.com/Gargron/nsa revision: d1079e0cdafdfed7f9f35478d13b9bdaa65965c0 ref: d1079e0cdafdfed7f9f35478d13b9bdaa65965c0 @@ -216,6 +204,12 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) + devise-two-factor (4.0.0) + activesupport (< 6.2) + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) + railties (< 6.2) + rotp (~> 6.0) devise_pam_authenticatable2 (9.2.0) devise (>= 4.0.0) rpam2 (~> 4.0) @@ -733,7 +727,7 @@ DEPENDENCIES concurrent-ruby connection_pool devise (~> 4.7) - devise-two-factor! + devise-two-factor (~> 4.0) devise_pam_authenticatable2 (~> 9.2) discard (~> 1.2) doorkeeper (~> 5.5) |