summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-03-31 00:05:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-03-31 00:05:14 +0000
commitae92150461ad4cffcf85a4dc6313bc403e596391 (patch)
tree1a7eca0fcd474f05f2fabee23f94b762a54d9d9e /Gemfile.lock
parent386b6dbcda5bb479ff0a6038d5dcf188bcd878b8 (diff)
downloadgitlab-ce-ae92150461ad4cffcf85a4dc6313bc403e596391.tar.gz
Add latest changes from gitlab-org/security/gitlab@14-9-stable-ee
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2b0057d353d..f97c2bf67ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -270,11 +270,11 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
- devise-two-factor (4.0.0)
- activesupport (< 6.2)
+ devise-two-factor (4.0.2)
+ activesupport (< 7.1)
attr_encrypted (>= 1.3, < 4, != 2)
devise (~> 4.0)
- railties (< 6.2)
+ railties (< 7.1)
rotp (~> 6.0)
diff-lcs (1.4.4)
diff_match_patch (0.1.0)
@@ -1457,7 +1457,7 @@ DEPENDENCIES
derailed_benchmarks
device_detector
devise (~> 4.7.2)
- devise-two-factor (~> 4.0.0)
+ devise-two-factor (~> 4.0.2)
diff_match_patch (~> 0.1.0)
diffy (~> 3.3)
discordrb-webhooks (~> 3.4)