From 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 19 May 2021 15:44:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-12-stable-ee --- Gemfile.lock | 141 ++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 46 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 007ca87b465..f6d6e07d3a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,11 +132,13 @@ GEM faraday_middleware (~> 1.0.0.rc1) net-http-persistent (~> 4.0) nokogiri (~> 1.11.0.rc2) - babosa (1.0.2) + babosa (1.0.4) + backport (1.1.2) base32 (0.3.2) batch-loader (2.0.1) bcrypt (3.1.16) bcrypt_pbkdf (1.0.0) + benchmark (0.1.1) benchmark-ips (2.3.0) benchmark-memory (0.1.2) memory_profiler (~> 0.9) @@ -160,13 +162,13 @@ GEM bundler (>= 1.2.0, < 3) thor (>= 0.18, < 2) byebug (11.1.3) - capybara (3.34.0) + capybara (3.35.3) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) @@ -245,6 +247,7 @@ GEM html-pipeline declarative (0.0.20) declarative-option (0.1.0) + declarative_policy (1.0.0) default_value_for (3.4.0) activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) @@ -306,6 +309,7 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) + e2mmap (0.1.0) ecma-re-validator (0.2.1) regexp_parser (~> 1.2) ed25519 (1.2.4) @@ -435,7 +439,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.11.0.pre.rc1) + gitaly (13.12.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -443,10 +447,11 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (1.1.1) + gitlab-dangerfiles (2.0.0) danger-gitlab - gitlab-experiment (0.5.3) + gitlab-experiment (0.5.4) activesupport (>= 3.0) + request_store (>= 1.0) scientist (~> 1.6, >= 1.6.0) gitlab-fog-azure-rm (1.0.1) azure-storage-blob (~> 2.0) @@ -462,21 +467,22 @@ GEM fog-xml (~> 0.1.0) google-api-client (>= 0.44.2, < 0.51) google-cloud-env (~> 1.2) - gitlab-labkit (0.16.2) + gitlab-labkit (0.17.1) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) - pg_query (~> 1.3) + pg_query (~> 2.0) redis (> 3.0.0, < 5.0.0) - gitlab-license (1.4.0) + gitlab-license (1.5.0) gitlab-mail_room (0.0.9) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) - gitlab-pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) + gitlab-omniauth-openid-connect (0.4.0) + addressable (~> 2.7) + omniauth (~> 1.9) + openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.5.6) sidekiq (~> 5) gitlab-styles (6.2.0) @@ -510,9 +516,9 @@ GEM signet (~> 0.12) google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.14.0) - googleapis-common-protos-types (1.0.5) - google-protobuf (~> 3.11) + google-protobuf (3.15.8) + googleapis-common-protos-types (1.0.6) + google-protobuf (~> 3.14) googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) @@ -529,10 +535,10 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.7.1) - activesupport (>= 4.0) + grape-entity (0.9.0) + activesupport (>= 3.0.0) multi_json (>= 1.3.2) - grape-path-helpers (1.6.1) + grape-path-helpers (1.6.3) activesupport grape (~> 1.3) rake (> 12) @@ -633,6 +639,7 @@ GEM jaeger-client (1.1.0) opentracing (~> 0.3) thrift + jaro_winkler (1.5.4) jira-ruby (2.1.4) activesupport atlassian-jwt @@ -648,8 +655,6 @@ GEM activesupport (>= 4.2) aes_key_wrap bindata - json-schema (2.8.1) - addressable (>= 2.4) json_schemer (0.2.12) ecma-re-validator (~> 0.2) hana (~> 1.3) @@ -870,12 +875,8 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) - omniauth_openid_connect (0.3.5) - addressable (~> 2.5) - omniauth (~> 1.9) - openid_connect (~> 1.1) open4 (1.3.4) - openid_connect (1.1.8) + openid_connect (1.2.0) activemodel attr_required (>= 1.0.0) json-jwt (>= 1.5.0) @@ -897,10 +898,13 @@ GEM parser (3.0.0.0) ast (~> 2.4.1) parslet (1.8.2) + pastel (0.8.0) + tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) - pg_query (1.3.0) + pg_query (2.0.3) + google-protobuf (~> 3.15.5) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) @@ -921,11 +925,15 @@ GEM pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) + pry-shell (0.4.0) + pry (~> 0.13.0) + tty-markdown + tty-prompt public_suffix (4.0.6) puma (5.1.1) nio4r (~> 2.0) @@ -1191,9 +1199,24 @@ GEM simplecov-html (0.12.2) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) - slop (3.6.0) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) + solargraph (0.40.4) + backport (~> 1.1) + benchmark + bundler (>= 1.17.2) + e2mmap + jaro_winkler (~> 1.5) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) + parser (~> 3.0) + reverse_markdown (>= 1.0.5, < 3) + rubocop (>= 0.52) + thor (~> 1.0) + tilt (~> 2.0) + yard (~> 0.9, >= 0.9.24) + spamcheck (0.1.0) + grpc (~> 1.0) spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -1215,7 +1238,12 @@ GEM state_machines-activerecord (0.8.0) activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) - swd (1.1.2) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + swd (1.2.0) activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -1261,6 +1289,23 @@ GEM truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) + tty-color (0.6.0) + tty-cursor (0.7.1) + tty-markdown (0.7.0) + kramdown (>= 1.16.2, < 3.0) + pastel (~> 0.8) + rouge (~> 3.14) + strings (~> 0.2.0) + tty-color (~> 0.5) + tty-screen (~> 0.8) + tty-prompt (0.23.1) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) tzinfo (1.2.9) thread_safe (~> 0.1) u2f (0.2.1) @@ -1329,12 +1374,14 @@ GEM builder expression_parser rinku + wisper (2.0.1) with_env (1.1.0) wmi-lite (1.0.5) xml-simple (1.1.5) xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.1) + yard (0.9.26) zeitwerk (2.4.2) PLATFORMS @@ -1360,7 +1407,7 @@ DEPENDENCIES aws-sdk-cloudformation (~> 1) aws-sdk-core (~> 3) aws-sdk-s3 (~> 1) - babosa (~> 1.0.2) + babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) bcrypt (~> 3.1, >= 3.1.14) @@ -1373,7 +1420,7 @@ DEPENDENCIES browser (~> 4.2) bullet (~> 6.1.3) bundler-audit (~> 0.7.0.1) - capybara (~> 3.34.0) + capybara (~> 3.35.3) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) @@ -1385,6 +1432,7 @@ DEPENDENCIES crystalball (~> 0.7.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) + declarative_policy (~> 1.0.0) default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks @@ -1425,30 +1473,30 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.11.0.pre.rc1) + gitaly (~> 13.12.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 1.1.1) - gitlab-experiment (~> 0.5.3) + gitlab-dangerfiles (~> 2.0.0) + gitlab-experiment (~> 0.5.4) gitlab-fog-azure-rm (~> 1.0.1) gitlab-fog-google (~> 1.13) - gitlab-labkit (~> 0.16.2) - gitlab-license (~> 1.4) + gitlab-labkit (~> 0.17.1) + gitlab-license (~> 1.5) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) - gitlab-pry-byebug + gitlab-omniauth-openid-connect (~> 0.4.0) gitlab-sidekiq-fetcher (= 0.5.6) gitlab-styles (~> 6.2.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.14.0) + google-protobuf (~> 3.15.8) gpgme (~> 2.0.19) grape (~> 1.5.2) - grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.6.1) + grape-entity (~> 0.9.0) + grape-path-helpers (~> 1.6.3) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphlient (~> 0.4.0) @@ -1472,7 +1520,6 @@ DEPENDENCIES jira-ruby (~> 2.1.4) js_regex (~> 3.4) json (~> 2.3.0) - json-schema (~> 2.8.0) json_schemer (~> 0.2.12) jwt (~> 2.1.0) kaminari (~> 1.0) @@ -1521,18 +1568,18 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0) - omniauth_openid_connect (~> 0.3.5) org-ruby (~> 0.9.12) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.1) - pg_query (~> 1.3.0) + pg_query (~> 2.0.3) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) + pry-byebug pry-rails (~> 0.3.9) - pry-remote + pry-shell (~> 0.4.0) puma (~> 5.1.1) puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) @@ -1587,6 +1634,8 @@ DEPENDENCIES simplecov-cobertura (~> 1.3.1) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) + solargraph (~> 0.40.4) + spamcheck (~> 0.1.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) -- cgit v1.2.3