diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 00:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 00:08:49 +0000 |
| commit | 9de5cc2d1f25957d51268cd5b4c9c77a4ba4f695 (patch) | |
| tree | 2b731956adb9c79408601c8f0d6157a84cbacc22 /vendor | |
| parent | cde60c9291a22ff0921f703568c4daef4a65ead7 (diff) | |
| download | gitlab-ce-9de5cc2d1f25957d51268cd5b4c9c77a4ba4f695.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/gems/devise-pbkdf2-encryptable/Gemfile.lock | 9 | ||||
| -rw-r--r-- | vendor/gems/ipynbdiff/Gemfile.lock | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/vendor/gems/devise-pbkdf2-encryptable/Gemfile.lock b/vendor/gems/devise-pbkdf2-encryptable/Gemfile.lock index 3be824244ad..ce0cb0c1025 100644 --- a/vendor/gems/devise-pbkdf2-encryptable/Gemfile.lock +++ b/vendor/gems/devise-pbkdf2-encryptable/Gemfile.lock @@ -46,10 +46,10 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) method_source (1.0.0) + mini_portile2 (2.8.0) minitest (5.16.0) - nokogiri (1.13.6-arm64-darwin) - racc (~> 1.4) - nokogiri (1.13.6-x86_64-linux) + nokogiri (1.13.6) + mini_portile2 (~> 2.8.0) racc (~> 1.4) orm_adapter (0.5.0) racc (1.6.0) @@ -92,8 +92,7 @@ GEM zeitwerk (2.6.0) PLATFORMS - arm64-darwin-21 - x86_64-linux + ruby DEPENDENCIES activemodel (~> 6.1, < 8) diff --git a/vendor/gems/ipynbdiff/Gemfile.lock b/vendor/gems/ipynbdiff/Gemfile.lock index 288a31ce75d..1c2fd81e3b4 100644 --- a/vendor/gems/ipynbdiff/Gemfile.lock +++ b/vendor/gems/ipynbdiff/Gemfile.lock @@ -52,8 +52,7 @@ GEM parser (>= 3.1.0) PLATFORMS - x86_64-darwin-20 - x86_64-linux + ruby DEPENDENCIES benchmark-memory (~> 0.2.0) |