Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 96 insertions, 66 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index dab51a0803c..6ccdd090ee9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,44 @@
 PATH
+  remote: vendor/gems/devise-pbkdf2-encryptable
+  specs:
+    devise-pbkdf2-encryptable (0.0.0)
+      devise (~> 4.0)
+
+PATH
+  remote: vendor/gems/error_tracking_open_api
+  specs:
+    error_tracking_open_api (1.0.0)
+      typhoeus (~> 1.0, >= 1.0.1)
+
+PATH
+  remote: vendor/gems/ipynbdiff
+  specs:
+    ipynbdiff (0.4.7)
+      diffy (~> 3.3)
+      oj (~> 3.13.16)
+
+PATH
   remote: vendor/gems/mail-smtp_pool
   specs:
     mail-smtp_pool (0.1.0)
       connection_pool (~> 2.0)
       mail (~> 2.7)
 
+PATH
+  remote: vendor/gems/omniauth-gitlab
+  specs:
+    omniauth-gitlab (4.0.0)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.7.1)
+
+PATH
+  remote: vendor/gems/omniauth_crowd
+  specs:
+    omniauth_crowd (2.4.0)
+      activesupport
+      nokogiri (>= 1.4.4)
+      omniauth (~> 1.0, < 3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -83,11 +117,11 @@ GEM
     apollo_upload_server (2.1.0)
       actionpack (>= 4.2)
       graphql (>= 1.8)
-    asana (0.10.3)
+    asana (0.10.13)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
       faraday_middleware-multi_json (~> 0.0)
-      oauth2 (~> 1.4)
+      oauth2 (>= 1.4, < 3)
     asciidoctor (2.0.15)
     asciidoctor-include-ext (0.4.0)
       asciidoctor (>= 1.5.6, < 3.0.0)
@@ -105,24 +139,24 @@ GEM
       execjs (> 0)
     awesome_print (1.9.2)
     awrence (1.1.1)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.345.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.600.0)
     aws-sdk-cloudformation (1.41.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.104.3)
+    aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.57.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.75.0)
-      aws-sdk-core (~> 3, >= 3.104.1)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
       azure-storage-common (~> 2.0)
@@ -475,7 +509,7 @@ GEM
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-dangerfiles (3.4.0)
+    gitlab-dangerfiles (3.4.3)
       danger (>= 8.4.5)
       danger-gitlab (>= 8.0.0)
       rake
@@ -523,9 +557,9 @@ GEM
       rubocop-rspec (~> 1.44)
     gitlab_chronic_duration (0.10.6.2)
       numerizer (~> 0.2)
-    gitlab_omniauth-ldap (2.1.1)
+    gitlab_omniauth-ldap (2.2.0)
       net-ldap (~> 0.16)
-      omniauth (~> 1.3)
+      omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
     globalid (1.0.0)
@@ -587,13 +621,13 @@ GEM
     graphql-client (0.17.0)
       activesupport (>= 3.0)
       graphql (~> 1.10)
-    graphql-docs (1.6.0)
+    graphql-docs (2.1.0)
       commonmarker (~> 0.16)
       escape_utils (~> 1.2)
       extended-markdown-filter (~> 0.4)
       gemoji (~> 3.0)
-      graphql (~> 1.6)
-      html-pipeline (~> 2.8)
+      graphql (~> 1.12)
+      html-pipeline (~> 2.9)
       sass (~> 3.4)
     grpc (1.42.0)
       google-protobuf (~> 3.18)
@@ -667,9 +701,6 @@ GEM
     invisible_captcha (1.1.0)
       rails (>= 4.2)
     ipaddress (0.8.3)
-    ipynbdiff (0.4.7)
-      diffy (~> 3.3)
-      json (~> 2.5, >= 2.5.1)
     jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
@@ -679,7 +710,7 @@ GEM
       atlassian-jwt
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
     js_regex (3.7.0)
       character_set (~> 1.4)
       regexp_parser (~> 2.1)
@@ -724,7 +755,7 @@ GEM
       rest-client (~> 2.0)
     launchy (2.5.0)
       addressable (~> 2.7)
-    lefthook (0.8.0)
+    lefthook (1.0.2)
     letter_opener (1.7.0)
       launchy (~> 2.2)
     letter_opener_web (2.0.0)
@@ -749,7 +780,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.16.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
@@ -815,12 +846,13 @@ GEM
       shellany (~> 0.0)
     numerizer (0.2.0)
     oauth (0.5.6)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (2.0.3)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+      rash_alt (>= 0.4, < 1)
+      version_gem (~> 1.0)
     octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -837,7 +869,7 @@ GEM
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
-    oj (3.10.6)
+    oj (3.13.16)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -868,18 +900,15 @@ GEM
     omniauth-github (1.4.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-gitlab (1.0.3)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.0)
     omniauth-google-oauth2 (0.6.0)
       jwt (>= 2.0)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.5)
-    omniauth-oauth (1.1.0)
+    omniauth-oauth (1.2.0)
       oauth
-      omniauth (~> 1.0)
-    omniauth-oauth2 (1.7.2)
-      oauth2 (~> 1.4)
+      omniauth (>= 1.0, < 3)
+    omniauth-oauth2 (1.7.3)
+      oauth2 (>= 1.4, < 3)
       omniauth (>= 1.9, < 3)
     omniauth-oauth2-generic (0.2.2)
       omniauth-oauth2 (~> 1.0)
@@ -894,10 +923,6 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    omniauth_crowd (2.4.0)
-      activesupport
-      nokogiri (>= 1.4.4)
-      omniauth (~> 1.0)
     open4 (1.3.4)
     openid_connect (1.3.0)
       activemodel
@@ -966,7 +991,7 @@ GEM
       coderay
       parser
       unparser
-    prometheus-client-mmap (0.15.0)
+    prometheus-client-mmap (0.16.2)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -988,7 +1013,7 @@ GEM
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.1.6)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.6.1)
@@ -1030,9 +1055,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    rails-i18n (6.0.0)
+    rails-i18n (7.0.3)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 7)
+      railties (>= 6.0.0, < 8)
     railties (6.1.4.7)
       actionpack (= 6.1.4.7)
       activesupport (= 6.1.4.7)
@@ -1042,6 +1067,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     randexp (0.1.7)
+    rash_alt (0.4.12)
+      hashie (>= 3.4)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -1174,7 +1201,7 @@ GEM
     ruby2_keywords (0.0.5)
     ruby_parser (3.15.0)
       sexp_processor (~> 4.9)
-    rubyntlm (0.6.2)
+    rubyntlm (0.6.3)
     rubypants (0.2.0)
     rubyzip (2.3.2)
     rugged (1.2.0)
@@ -1225,8 +1252,8 @@ GEM
     settingslogic (2.0.9)
     sexp_processor (4.15.1)
     shellany (0.0.1)
-    shoulda-matchers (4.0.1)
-      activesupport (>= 4.2.0)
+    shoulda-matchers (5.1.0)
+      activesupport (>= 5.2.0)
     sidekiq (6.4.0)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
@@ -1400,6 +1427,7 @@ GEM
     validates_hostname (1.0.11)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
+    version_gem (1.0.0)
     version_sorter (2.2.4)
     view_component (2.50.0)
       activesupport (>= 5.0.0, < 8.0)
@@ -1407,7 +1435,7 @@ GEM
     vmstat (2.3.0)
     warden (1.2.8)
       rack (>= 2.0.6)
-    warning (1.2.0)
+    warning (1.3.0)
     webauthn (2.3.0)
       android_key_attestation (~> 0.3.0)
       awrence (~> 1.1)
@@ -1454,7 +1482,7 @@ DEPENDENCIES
   addressable (~> 2.8)
   akismet (~> 3.0)
   apollo_upload_server (~> 2.1.0)
-  asana (~> 0.10.3)
+  asana (~> 0.10.13)
   asciidoctor (~> 2.0.10)
   asciidoctor-include-ext (~> 0.4.0)
   asciidoctor-kroki (~> 0.5.0)
@@ -1464,8 +1492,8 @@ DEPENDENCIES
   autoprefixer-rails (= 10.2.5.1)
   awesome_print
   aws-sdk-cloudformation (~> 1)
-  aws-sdk-core (~> 3)
-  aws-sdk-s3 (~> 1)
+  aws-sdk-core (~> 3.131.0)
+  aws-sdk-s3 (~> 1.114.0)
   babosa (~> 1.0.4)
   base32 (~> 0.3.0)
   batch-loader (~> 2.0.1)
@@ -1496,6 +1524,7 @@ DEPENDENCIES
   derailed_benchmarks
   device_detector
   devise (~> 4.7.2)
+  devise-pbkdf2-encryptable (~> 0.0.0)!
   devise-two-factor (~> 4.0.2)
   diff_match_patch (~> 0.1.0)
   diffy (~> 3.3)
@@ -1508,6 +1537,7 @@ DEPENDENCIES
   elasticsearch-rails (~> 7.2)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  error_tracking_open_api!
   erubi (~> 1.9.0)
   escape_utils (~> 1.1)
   factory_bot_rails (~> 6.2.0)
@@ -1534,7 +1564,7 @@ DEPENDENCIES
   gitaly (~> 15.1.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 3.4.0)
+  gitlab-dangerfiles (~> 3.4.3)
   gitlab-experiment (~> 0.7.1)
   gitlab-fog-azure-rm (~> 1.3.0)
   gitlab-labkit (~> 0.23.0)
@@ -1547,7 +1577,7 @@ DEPENDENCIES
   gitlab-sidekiq-fetcher (= 0.8.0)
   gitlab-styles (~> 7.1.0)
   gitlab_chronic_duration (~> 0.10.6.2)
-  gitlab_omniauth-ldap (~> 2.1.1)
+  gitlab_omniauth-ldap (~> 2.2.0)
   gon (~> 6.4.0)
   google-api-client (~> 0.33)
   google-protobuf (~> 3.19.0)
@@ -1559,7 +1589,7 @@ DEPENDENCIES
   graphiql-rails (~> 1.8)
   graphlient (~> 0.5.0)
   graphql (~> 1.13.12)
-  graphql-docs (~> 1.6.0)
+  graphql-docs (~> 2.1.0)
   grpc (~> 1.42.0)
   gssapi
   guard-rspec
@@ -1575,7 +1605,7 @@ DEPENDENCIES
   icalendar
   invisible_captcha (~> 1.1.0)
   ipaddress (~> 0.8.3)
-  ipynbdiff (= 0.4.7)
+  ipynbdiff!
   jira-ruby (~> 2.1.4)
   js_regex (~> 3.7)
   json (~> 2.5.1)
@@ -1586,12 +1616,12 @@ DEPENDENCIES
   knapsack (~> 1.21.1)
   kramdown (~> 2.3.1)
   kubeclient (~> 4.9.2)
-  lefthook (~> 0.8.0)
+  lefthook (~> 1.0.0)
   letter_opener_web (~> 2.0.0)
   licensee (~> 9.14.1)
   lockbox (~> 0.6.2)
   lograge (~> 0.5)
-  loofah (~> 2.2)
+  loofah (~> 2.18.0)
   lru_redux
   mail (= 2.7.1)
   mail-smtp_pool (~> 0.1.0)!
@@ -1604,10 +1634,10 @@ DEPENDENCIES
   net-ldap (~> 0.16.3)
   net-ntp
   nokogiri (~> 1.13.6)
-  oauth2 (~> 1.4)
+  oauth2 (~> 2.0)
   octokit (~> 4.15)
   ohai (~> 16.10)
-  oj (~> 3.10.6)
+  oj (~> 3.13.16)
   omniauth (~> 1.8)
   omniauth-alicloud (~> 1.0.1)
   omniauth-atlassian-oauth2 (~> 0.2.0)
@@ -1619,14 +1649,14 @@ DEPENDENCIES
   omniauth-dingtalk-oauth2 (~> 1.0)
   omniauth-facebook (~> 4.0.0)
   omniauth-github (~> 1.4)
-  omniauth-gitlab (~> 1.0.2)
+  omniauth-gitlab (~> 4.0.0)!
   omniauth-google-oauth2 (~> 0.6.0)
   omniauth-oauth2-generic (~> 0.2.2)
   omniauth-salesforce (~> 1.0.5)
   omniauth-saml (~> 1.10)
   omniauth-shibboleth (~> 1.3.0)
   omniauth-twitter (~> 1.4)
-  omniauth_crowd (~> 2.4.0)
+  omniauth_crowd (~> 2.4.0)!
   org-ruby (~> 0.9.12)
   pact (~> 1.12)
   parallel (~> 1.19)
@@ -1636,13 +1666,13 @@ DEPENDENCIES
   pg_query (~> 2.1.0)
   png_quantizator (~> 0.2.1)
   premailer-rails (~> 1.10.3)
-  prometheus-client-mmap (~> 0.15.0)
+  prometheus-client-mmap (~> 0.16)
   pry-byebug
   pry-rails (~> 0.3.9)
   pry-shell (~> 0.5.0)
   puma (~> 5.6.2)
   puma_worker_killer (~> 0.3.1)
-  rack (~> 2.2.3.0)
+  rack (~> 2.2.4)
   rack-attack (~> 6.6.0)
   rack-cors (~> 1.1.0)
   rack-oauth2 (~> 1.19.0)
@@ -1650,7 +1680,7 @@ DEPENDENCIES
   rack-timeout (~> 0.6.0)
   rails (~> 6.1.4.7)
   rails-controller-testing
-  rails-i18n (~> 6.0)
+  rails-i18n (~> 7.0)
   rainbow (~> 3.0)
   rbtrace (~> 0.4)
   rdoc (~> 6.3.2)
@@ -1690,7 +1720,7 @@ DEPENDENCIES
   sentry-ruby (~> 5.1.1)
   sentry-sidekiq (~> 5.1.1)
   settingslogic (~> 2.0.9)
-  shoulda-matchers (~> 4.0.1)
+  shoulda-matchers (~> 5.1.0)
   sidekiq (~> 6.4)
   sidekiq-cron (~> 1.2)
   sigdump (~> 0.2.4)
@@ -1730,7 +1760,7 @@ DEPENDENCIES
   version_sorter (~> 2.2.4)
   view_component (~> 2.50.0)
   vmstat (~> 2.3.0)
-  warning (~> 1.2.0)
+  warning (~> 1.3.0)
   webauthn (~> 2.3)
   webmock (~> 3.9.1)
   webrick (~> 1.6.1)