diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-25 18:11:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-25 18:11:55 +0000 |
| commit | 2b2d833ab3e78f8c9f626af950a16d43fc38c9f8 (patch) | |
| tree | 13c101679f3cda5808affea46709207a24f4a3c9 /Gemfile.lock | |
| parent | 7d8d5a3dab415672a41ab29c3bfa9581f275dc50 (diff) | |
| download | gitlab-ce-2b2d833ab3e78f8c9f626af950a16d43fc38c9f8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1c47f52dff1..2dee6391d82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,7 +137,6 @@ GEM base32 (0.3.2) batch-loader (2.0.1) bcrypt (3.1.16) - bcrypt_pbkdf (1.1.0) benchmark (0.1.1) benchmark-ips (2.3.0) benchmark-memory (0.1.2) @@ -308,7 +307,6 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) - ed25519 (1.2.4) elasticsearch (6.8.2) elasticsearch-api (= 6.8.2) elasticsearch-transport (= 6.8.2) @@ -1408,7 +1406,6 @@ DEPENDENCIES base32 (~> 0.3.0) batch-loader (~> 2.0.1) bcrypt (~> 3.1, >= 3.1.14) - bcrypt_pbkdf (~> 1.1) benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) @@ -1441,7 +1438,6 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) - ed25519 (~> 1.2) elasticsearch-api (~> 6.8.2) elasticsearch-model (~> 6.1) elasticsearch-rails (~> 6.1) @@ -1542,7 +1538,6 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - net-ssh (~> 6.0) nokogiri (~> 1.12) oauth2 (~> 1.4) octokit (~> 4.15) |