Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 33 insertions, 36 deletions

diff --git a/Gemfile b/Gemfile
index df9b68c5495..e85488a34fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,25 +2,25 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.1.4.7'
+gem 'rails', '~> 6.1.6.1'
 
-gem 'bootsnap', '~> 1.12.0', require: false
+gem 'bootsnap', '~> 1.13.0', require: false
 
 # Responders respond_to and respond_with
 gem 'responders', '~> 3.0'
 
 gem 'sprockets', '~> 3.7.0'
 
-gem 'view_component', '~> 2.50.0'
+gem 'view_component', '~> 2.61'
 
 # Default values for AR models
 gem 'default_value_for', '~> 3.4.0'
 
 # Supported DBs
-gem 'pg', '~> 1.3.0'
+gem 'pg', '~> 1.4.0'
 
 gem 'rugged', '~> 1.2'
-gem 'grape-path-helpers', '~> 1.7.0'
+gem 'grape-path-helpers', '~> 1.7.1'
 
 gem 'faraday', '~> 1.0'
 gem 'marginalia', '~> 1.10.0'
@@ -39,8 +39,8 @@ gem 'ruby-saml', '~> 1.13.0'
 gem 'omniauth', '~> 1.8'
 gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
-gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
-gem 'omniauth-cas3', '~> 1.1.4'
+gem 'omniauth-azure-oauth2', '~> 0.0.9' # See vendor/gems/omniauth-azure-oauth2/README.md
+gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
 gem 'omniauth-dingtalk-oauth2', '~> 1.0'
 gem 'omniauth-alicloud', '~> 1.0.1'
 gem 'omniauth-facebook', '~> 4.0.0'
@@ -56,7 +56,7 @@ gem 'omniauth-authentiq', '~> 0.3.3'
 gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
 gem 'omniauth-salesforce', '~> 1.0.5'
 gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
-gem 'rack-oauth2', '~> 1.19.0'
+gem 'rack-oauth2', '~> 1.21.2'
 gem 'jwt', '~> 2.1.0'
 
 # Kerberos authentication. EE-only
@@ -78,7 +78,7 @@ gem 'u2f', '~> 0.2.1'
 gem 'validates_hostname', '~> 1.0.11'
 gem 'rubyzip', '~> 2.3.2', require: 'zip'
 # GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0', '>= 2.0.9'
+gem 'acme-client', '~> 2.0'
 
 # Browser detection
 gem 'browser', '~> 4.2'
@@ -168,10 +168,10 @@ gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
 gem 'asciidoctor-kroki', '~> 0.5.0', require: false
-gem 'rouge', '~> 3.29.0'
-gem 'truncato', '~> 0.7.11'
+gem 'rouge', '~> 3.30.0'
+gem 'truncato', '~> 0.7.12'
 gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.13.6'
+gem 'nokogiri', '~> 1.13.0'
 gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
@@ -187,7 +187,7 @@ gem 'rack', '~> 2.2.4'
 gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base'
 
 group :puma do
-  gem 'puma', '~> 5.6.2', require: false
+  gem 'puma', '~> 5.6.4', require: false
   gem 'puma_worker_killer', '~> 0.3.1', require: false
   gem 'sd_notify', '~> 0.1.0', require: false
 end
@@ -237,7 +237,7 @@ gem 'redis', '~> 4.4.0'
 gem 'connection_pool', '~> 2.0'
 
 # Redis session store
-gem 'redis-actionpack', '~> 5.2.0'
+gem 'redis-actionpack', '~> 5.3.0'
 
 # Discord integration
 gem 'discordrb-webhooks', '~> 3.4', require: false
@@ -262,7 +262,7 @@ gem 'asana', '~> 0.10.13'
 gem 'ruby-fogbugz', '~> 0.2.1'
 
 # Kubernetes integration
-gem 'kubeclient', '~> 4.9.2'
+gem 'kubeclient', '~> 4.9.3'
 
 # Sanitize user input
 gem 'sanitize', '~> 6.0'
@@ -299,7 +299,7 @@ gem 'gon', '~> 6.4.0'
 gem 'request_store', '~> 1.5'
 gem 'base32', '~> 0.3.0'
 
-gem 'gitlab-license', '~> 2.1.0'
+gem 'gitlab-license', '~> 2.2.1'
 
 # Protect against bruteforcing
 gem 'rack-attack', '~> 6.6.0'
@@ -317,7 +317,7 @@ gem 'pg_query', '~> 2.1.0'
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.23.0'
+gem 'gitlab-labkit', '~> 0.24.0'
 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
 gem 'thrift', '>= 0.14.0'
@@ -345,27 +345,25 @@ gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client'
 gem 'warning', '~> 1.3.0'
 
 group :development do
-  gem 'lefthook', '~> 1.0.0', require: false
+  gem 'lefthook', '~> 1.1.0', require: false
   gem 'rubocop'
-  gem 'solargraph', '~> 0.44.3', require: false
+  gem 'solargraph', '~> 0.45.0', require: false
 
   gem 'letter_opener_web', '~> 2.0.0'
+  gem 'lookbook'
 
   # Better errors handler
   gem 'better_errors', '~> 2.9.0'
 
-  # thin instead webrick
-  gem 'thin', '~> 1.8.0'
-
   gem 'sprite-factory', '~> 1.7'
 end
 
 group :development, :test do
   gem 'deprecation_toolkit', '~> 1.5.1', require: false
-  gem 'bullet', '~> 6.1.3'
+  gem 'bullet', '~> 7.0.2'
   gem 'pry-byebug'
   gem 'pry-rails', '~> 0.3.9'
-  gem 'pry-shell', '~> 0.5.0'
+  gem 'pry-shell', '~> 0.5.1'
 
   gem 'awesome_print', require: false
 
@@ -408,7 +406,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 3.4.3', require: false
+  gem 'gitlab-dangerfiles', '~> 3.5.0', require: false
 end
 
 group :development, :test, :coverage do
@@ -420,10 +418,7 @@ end
 
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
-  # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
-  # resolved. For details, check discussion in
-  # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
-  gem 'gitlab-license_finder', '~> 6.0', require: false
+  gem 'license_finder', '~> 7.0', require: false
 end
 
 group :test do
@@ -437,6 +432,8 @@ group :test do
   gem 'capybara-screenshot', '~> 1.0.22'
   gem 'selenium-webdriver', '~> 3.142'
 
+  gem 'graphlyte', '~> 1.0.0'
+
   gem 'shoulda-matchers', '~> 5.1.0', require: false
   gem 'email_spec', '~> 2.2.0'
   gem 'webmock', '~> 3.9.1'
@@ -486,21 +483,21 @@ gem 'ssh_data', '~> 1.3'
 gem 'spamcheck', '~> 0.1.0'
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 15.1.0-rc1'
+gem 'gitaly', '~> 15.3.0-rc3'
 
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.0.2'
 
 gem 'grpc', '~> 1.42.0'
 
-gem 'google-protobuf', '~> 3.19.0'
+gem 'google-protobuf', '~> 3.21'
 
 gem 'toml-rb', '~> 2.0'
 
 # Feature toggles
-gem 'flipper', '~> 0.21.0'
-gem 'flipper-active_record', '~> 0.21.0'
-gem 'flipper-active_support_cache_store', '~> 0.21.0'
+gem 'flipper', '~> 0.25.0'
+gem 'flipper-active_record', '~> 0.25.0'
+gem 'flipper-active_support_cache_store', '~> 0.25.0'
 gem 'unleash', '~> 3.2.2'
 gem 'gitlab-experiment', '~> 0.7.1'
 
@@ -536,9 +533,9 @@ gem 'valid_email', '~> 0.1'
 # JSON
 gem 'json', '~> 2.5.1'
 gem 'json_schemer', '~> 0.2.18'
-gem 'oj', '~> 3.13.19'
+gem 'oj', '~> 3.13.20'
 gem 'multi_json', '~> 1.14.1'
-gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
+gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
 
 gem 'webauthn', '~> 2.3'