diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 06:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 06:08:58 +0000 |
| commit | 18b8435318887d3fc6e9f9d305967a953cdd7d3f (patch) | |
| tree | 28cb71f255eb364c224ff24dd085f8cd836951b1 /Gemfile.lock | |
| parent | 4359b9650ecf0960f04f0fd38fc25bec7b478a11 (diff) | |
| download | gitlab-ce-18b8435318887d3fc6e9f9d305967a953cdd7d3f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 19b107f41f0..724021ced7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,11 +229,11 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport + devise-two-factor (3.1.0) + activesupport (< 6.1) attr_encrypted (>= 1.3, < 4, != 2) devise (~> 4.0) - railties + railties (< 6.1) rotp (~> 2.0) diff-lcs (1.3) diff_match_patch (0.1.0) @@ -1193,7 +1193,7 @@ DEPENDENCIES derailed_benchmarks device_detector devise (~> 4.6) - devise-two-factor (~> 3.0.0) + devise-two-factor (~> 3.1.0) diff_match_patch (~> 0.1.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) |