diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /Gemfile.lock | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) | |
download | gitlab-ce-36a59d088eca61b834191dacea009677a96c052f.tar.gz |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 72 |
1 files changed, 39 insertions, 33 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9a67aa1b017..87bb6167b65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,7 +150,7 @@ GEM rack (>= 0.9.0) bindata (2.4.10) binding_ninja (0.2.3) - bootsnap (1.9.1) + bootsnap (1.9.4) msgpack (~> 1.0) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -313,17 +313,17 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) - elasticsearch (6.8.2) - elasticsearch-api (= 6.8.2) - elasticsearch-transport (= 6.8.2) - elasticsearch-api (6.8.2) + elasticsearch (7.13.3) + elasticsearch-api (= 7.13.3) + elasticsearch-transport (= 7.13.3) + elasticsearch-api (7.13.3) multi_json - elasticsearch-model (6.1.1) + elasticsearch-model (7.2.0) activesupport (> 3) - elasticsearch (~> 6) + elasticsearch (~> 7) hashie - elasticsearch-rails (6.1.1) - elasticsearch-transport (6.8.2) + elasticsearch-rails (7.2.1) + elasticsearch-transport (7.13.3) faraday (~> 1) multi_json email_reply_trimmer (0.1.6) @@ -349,13 +349,17 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.4.2) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -365,9 +369,15 @@ GEM faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) - faraday_middleware (1.0.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (0.3.0) aws-sigv4 (~> 1.0) @@ -567,14 +577,14 @@ GEM graphiql-rails (1.8.0) railties sprockets-rails - graphlient (0.4.0) + graphlient (0.5.0) faraday (>= 1.0) faraday_middleware graphql-client graphql (1.11.10) - graphql-client (0.16.0) + graphql-client (0.17.0) activesupport (>= 3.0) - graphql (~> 1.8) + graphql (~> 1.10) graphql-docs (1.6.0) commonmarker (~> 0.16) escape_utils (~> 1.2) @@ -655,7 +665,7 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.4.5) + ipynbdiff (0.4.7) diffy (~> 3.3) json (~> 2.5, >= 2.5.1) jaeger-client (1.1.0) @@ -774,7 +784,7 @@ GEM faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) - msgpack (1.3.3) + msgpack (1.5.1) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -863,11 +873,6 @@ GEM jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) @@ -1078,7 +1083,7 @@ GEM rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-mocks (3.10.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-parameterized (0.5.0) @@ -1140,7 +1145,7 @@ GEM nokogiri (>= 1.10.5) rexml ruby-statistics (3.0.0) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) ruby_parser (3.15.0) sexp_processor (~> 4.9) rubyntlm (0.6.2) @@ -1437,7 +1442,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) - bootsnap (~> 1.9.1) + bootsnap (~> 1.9.4) bootstrap_form (~> 4.2.0) browser (~> 4.2) bullet (~> 6.1.3) @@ -1466,9 +1471,9 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) - elasticsearch-api (~> 6.8.2) - elasticsearch-model (~> 6.1) - elasticsearch-rails (~> 6.1) + elasticsearch-api (= 7.13.3) + elasticsearch-model (~> 7.2) + elasticsearch-rails (~> 7.2) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) erubi (~> 1.9.0) @@ -1520,7 +1525,7 @@ DEPENDENCIES grape-path-helpers (~> 1.7.0) grape_logging (~> 1.7) graphiql-rails (~> 1.8) - graphlient (~> 0.4.0) + graphlient (~> 0.5.0) graphql (~> 1.11.10) graphql-docs (~> 1.6.0) grpc (~> 1.42.0) @@ -1538,7 +1543,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.4.5) + ipynbdiff (= 0.4.7) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1584,7 +1589,6 @@ DEPENDENCIES omniauth-github (~> 1.4) omniauth-gitlab (~> 1.0.2) omniauth-google-oauth2 (~> 0.6.0) - omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-salesforce (~> 1.0.5) omniauth-saml (~> 1.10) @@ -1634,6 +1638,7 @@ DEPENDENCIES rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) + rubocop ruby-fogbugz (~> 0.2.1) ruby-magic (~> 0.5) ruby-prof (~> 1.3.0) @@ -1679,6 +1684,7 @@ DEPENDENCIES thin (~> 1.8.0) thrift (>= 0.14.0) timecop (~> 0.9.1) + timfel-krb5-auth (~> 0.8) toml-rb (~> 2.0) truncato (~> 0.7.11) typhoeus (~> 1.4.0) |