summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjennli <jli@gitlab.com>2022-07-04 12:52:29 -0700
committerjennli <jli@gitlab.com>2022-07-04 12:52:29 -0700
commit8801a8e8bed801fd743b55b8900874afab959ddf (patch)
tree3ac86c847a5f6244cf402301a45cfa77a3a20c38
parent0ac5997837f2783d0646fe28aee3437079d601a8 (diff)
downloadgitlab-ce-jennli-test-pipeline.tar.gz
Revert my changes, hope to see my pipeline failsjennli-test-pipeline
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock7
2 files changed, 8 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index c43fe87c443..81791a3edab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,6 +30,7 @@ gem 'declarative_policy', '~> 1.1.0'
# Authentication libraries
gem 'devise', '~> 4.7.2'
+gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable'
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
gem 'doorkeeper', '~> 5.5.0.rc2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f6b98c0876..3dc9764ccd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,10 @@
PATH
+ remote: vendor/gems/devise-pbkdf2-encryptable
+ specs:
+ devise-pbkdf2-encryptable (0.0.0)
+ devise (~> 4.0)
+
+PATH
remote: vendor/gems/error_tracking_open_api
specs:
error_tracking_open_api (1.0.0)
@@ -1514,6 +1520,7 @@ DEPENDENCIES
derailed_benchmarks
device_detector
devise (~> 4.7.2)
+ devise-pbkdf2-encryptable (~> 0.0.0)!
devise-two-factor (~> 4.0.2)
diff_match_patch (~> 0.1.0)
diffy (~> 3.3)