diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-09-19 21:16:18 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-09-19 21:16:18 -0400 |
| commit | 259851c0d601632ad02a9f6ac0d59276552570b9 (patch) | |
| tree | ee51f875433e2df76f88a1ae8bad83225afe6400 /Gemfile.lock | |
| parent | 69723d20024821fb4206e899ffa3acd2da690315 (diff) | |
| download | gitlab-ce-259851c0d601632ad02a9f6ac0d59276552570b9.tar.gz | |
Bump devise-two-factor to 2.0.0rs-bump-two-factor
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605
See https://github.com/tinfoil/devise-two-factor/pull/43
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a8a067eb785..320f7629fb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -145,13 +145,12 @@ GEM warden (~> 1.2.3) devise-async (0.9.0) devise (~> 3.2) - devise-two-factor (1.0.2) - activemodel + devise-two-factor (2.0.0) activesupport attr_encrypted (~> 1.3.2) devise (~> 3.5.0) railties - rotp (< 2) + rotp (~> 2) diff-lcs (1.2.5) diffy (3.0.7) docile (1.1.5) @@ -566,7 +565,7 @@ GEM mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rinku (1.7.3) - rotp (1.6.1) + rotp (2.1.1) rouge (1.10.1) rqrcode (0.7.0) chunky_png @@ -811,7 +810,7 @@ DEPENDENCIES default_value_for (~> 3.0.0) devise (~> 3.5.2) devise-async (~> 0.9.0) - devise-two-factor (~> 1.0.1) + devise-two-factor (~> 2.0.0) diffy (~> 3.0.3) doorkeeper (~> 2.1.3) dropzonejs-rails (~> 0.7.1) |