diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-09 18:09:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-09 18:09:10 +0300 |
| commit | 9ea69b43c3502c4c63e6d47da40786875197fcf3 (patch) | |
| tree | 34a74f05ff8321a9dc16bb22dd3d3fe6ef55d3e7 /Gemfile.lock | |
| parent | 45c999c8bcab0cd8ea766919634580465e5080d9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 682e8432b55..724412fa8ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,12 +264,12 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-two-factor (3.1.0) - activesupport (< 6.1) + devise-two-factor (4.0.0) + activesupport (< 6.2) attr_encrypted (>= 1.3, < 4, != 2) devise (~> 4.0) - railties (< 6.1) - rotp (~> 2.0) + railties (< 6.2) + rotp (~> 6.0) diff-lcs (1.4.4) diff_match_patch (0.1.0) diffy (3.3.0) @@ -1044,7 +1044,7 @@ GEM nokogiri rexml (3.2.4) rinku (2.0.0) - rotp (2.1.2) + rotp (6.2.0) rouge (3.26.0) rqrcode (0.7.0) chunky_png @@ -1385,7 +1385,7 @@ DEPENDENCIES derailed_benchmarks device_detector devise (~> 4.7.2) - devise-two-factor (~> 3.1.0) + devise-two-factor (~> 4.0.0) diff_match_patch (~> 0.1.0) diffy (~> 3.3) discordrb-webhooks (~> 3.4) |