diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-13 00:10:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-13 00:10:34 +0300 |
commit | a9acc0c2fb0f280077edc7a70dbf383c55252af8 (patch) | |
tree | ddc5ecf168a9402d35b82f1d215a8153a3b1d542 /vendor | |
parent | 41b2e83ad69056b850e278e4bd0a7a4f3e585376 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
4 files changed, 86 insertions, 11 deletions
diff --git a/vendor/gems/attr_encrypted/Gemfile.lock b/vendor/gems/attr_encrypted/Gemfile.lock index 72626225cf7..1094e6da3fc 100644 --- a/vendor/gems/attr_encrypted/Gemfile.lock +++ b/vendor/gems/attr_encrypted/Gemfile.lock @@ -100,9 +100,11 @@ GEM loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) + mini_portile2 (2.8.0) minitest (5.16.3) multi_json (1.15.0) - nokogiri (1.13.8-x86_64-linux) + nokogiri (1.13.8) + mini_portile2 (~> 2.8.0) racc (~> 1.4) public_suffix (5.0.0) racc (1.6.0) @@ -124,15 +126,16 @@ GEM simplecov-rcov (0.3.1) simplecov (>= 0.4.1) simplecov_json_formatter (0.1.4) - sqlite3 (1.5.0-x86_64-linux) + sqlite3 (1.5.0) + mini_portile2 (~> 2.8.0) stringex (1.5.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) uuidtools (2.2.0) - zeitwerk (2.6.0) + zeitwerk (2.6.1) PLATFORMS - x86_64-linux + ruby DEPENDENCIES actionpack (~> 6.1) @@ -149,4 +152,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 2.3.19 + 2.3.22 diff --git a/vendor/gems/bundler-checksum/test/project_with_checksum_lock/Gemfile.checksum b/vendor/gems/bundler-checksum/test/project_with_checksum_lock/Gemfile.checksum index cf70611c97a..1670ac8e688 100644 --- a/vendor/gems/bundler-checksum/test/project_with_checksum_lock/Gemfile.checksum +++ b/vendor/gems/bundler-checksum/test/project_with_checksum_lock/Gemfile.checksum @@ -21,6 +21,7 @@ {"name":"marcel","version":"1.0.2","platform":"ruby","checksum":"a013b677ef46cbcb49fd5c59b3d35803d2ee04dd75d8bfdc43533fc5a31f7e4e"}, {"name":"method_source","version":"1.0.0","platform":"ruby","checksum":"d779455a2b5666a079ce58577bfad8534f571af7cec8107f4dce328f0981dede"}, {"name":"mini_mime","version":"1.1.2","platform":"ruby","checksum":"a54aec0cc7438a03a850adb00daca2bdb60747f839e28186994df057cea87151"}, +{"name":"mini_portile2","version":"2.8.0","platform":"ruby","checksum":"1e06b286ff19b73cfc9193cb3dd2bd80416f8262443564b25b23baea74a05765"}, {"name":"minitest","version":"5.16.2","platform":"ruby","checksum":"c1be0c6b57fab451faa08e74ffa71e7d6a259b90f4bacb881c7f4808ec8b4991"}, {"name":"nio4r","version":"2.5.8","platform":"java","checksum":"b2b1800f6bf7ce4b797ca8b639ad278a99c9c904fb087a91d944f38e4bd71401"}, {"name":"nio4r","version":"2.5.8","platform":"ruby","checksum":"3becb4ad95ab8ac0a9bd2e1b16466869402be62848082bf6329ae9091f276676"}, diff --git a/vendor/gems/bundler-checksum/test/project_with_checksum_lock/Gemfile.lock b/vendor/gems/bundler-checksum/test/project_with_checksum_lock/Gemfile.lock index 8f4bb5fa40d..d633184e300 100644 --- a/vendor/gems/bundler-checksum/test/project_with_checksum_lock/Gemfile.lock +++ b/vendor/gems/bundler-checksum/test/project_with_checksum_lock/Gemfile.lock @@ -76,11 +76,11 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) + mini_portile2 (2.8.0) minitest (5.16.2) nio4r (2.5.8) - nokogiri (1.13.8-arm64-darwin) - racc (~> 1.4) - nokogiri (1.13.8-x86_64-linux) + nokogiri (1.13.8) + mini_portile2 (~> 2.8.0) racc (~> 1.4) racc (1.6.0) rack (2.2.4) @@ -129,11 +129,10 @@ GEM zeitwerk (2.6.0) PLATFORMS - arm64-darwin-21 - x86_64-linux + ruby DEPENDENCIES rails (~> 6.1.6.1) BUNDLED WITH - 2.3.19 + 2.3.22 diff --git a/vendor/gems/omniauth-google-oauth2/examples/Gemfile.lock b/vendor/gems/omniauth-google-oauth2/examples/Gemfile.lock new file mode 100644 index 00000000000..5ac8f1be5e0 --- /dev/null +++ b/vendor/gems/omniauth-google-oauth2/examples/Gemfile.lock @@ -0,0 +1,72 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.2) + faraday (2.5.2) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.0) + hashie (5.0.0) + json (2.6.2) + jwt (2.5.0) + multi_json (1.15.0) + multi_xml (0.6.0) + oauth2 (1.4.11) + faraday (>= 0.17.3, < 3.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 4) + omniauth (1.9.2) + hashie (>= 3.4.6) + rack (>= 1.6.2, < 3) + omniauth-google-oauth2 (0.8.2) + jwt (>= 2.0) + oauth2 (~> 1.1) + omniauth (~> 1.1) + omniauth-oauth2 (>= 1.6) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) + omniauth (>= 1.9, < 3) + parallel (1.22.1) + parser (3.1.2.1) + ast (~> 2.4.1) + rack (1.6.13) + rack-protection (1.5.5) + rack + rainbow (3.1.1) + regexp_parser (2.6.0) + rexml (3.2.5) + rubocop (1.36.0) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.1.2.1) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.20.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.21.0) + parser (>= 3.1.1.0) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) + sinatra (1.4.8) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + tilt (2.0.11) + unicode-display_width (2.3.0) + webrick (1.7.0) + +PLATFORMS + ruby + +DEPENDENCIES + omniauth-google-oauth2 (~> 0.8.1) + rubocop + sinatra (~> 1.4) + webrick + +BUNDLED WITH + 2.3.22 |