--- Gemfile.orig	2023-01-09 12:50:34 UTC
+++ Gemfile
@@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems
 # NOTE: When incrementing the major or minor version here, also increment activerecord_version
 # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
 # https://gitlab.com/gitlab-org/gitlab/-/issues/375713
-gem 'rails', '~> 6.1.6.1'
+gem 'rails', '~> 6.1.6'
 
-gem 'bootsnap', '~> 1.13.0', require: false
+gem 'bootsnap', '~> 1.14.0', require: false
 
 # Pin openssl to match the version bundled with our supported Rubies.
 # See https://stdgems.org/openssl/#gem-version.
@@ -57,18 +57,18 @@ gem 'doorkeeper-openid_connect', '~> 1.7.5'
 gem 'rexml', '~> 3.2.5'
 gem 'ruby-saml', '~> 1.13.0'
 gem 'omniauth', '~> 2.1.0'
-gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth-auth0', '>= 2.0.0'
 gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem 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', '~> 2.0.0'
-gem 'omniauth-facebook', '~> 4.0.0'
-gem 'omniauth-github', '2.0.1'
+gem 'omniauth-facebook', '>= 4.0.0'
+gem 'omniauth-github', '~> 2.0.1'
 gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
 gem 'omniauth-google-oauth2', '~> 1.1'
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
-gem 'omniauth-saml', '~> 2.0.0'
+gem 'omniauth-saml', '~> 2.0'
 gem 'omniauth-shibboleth', '~> 1.3.0'
 gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
@@ -77,7 +77,7 @@ gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', req
 gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
 gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
 gem 'rack-oauth2', '~> 1.21.3'
-gem 'jwt', '~> 2.1.0'
+gem 'jwt', '~> 2.5.0'
 
 # Kerberos authentication. EE-only
 gem 'gssapi', group: :kerberos
@@ -113,7 +113,7 @@ gem 'gpgme', '~> 2.0.19'
 # GitLab fork with several improvements to original library. For full list of changes
 # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
 gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap'
-gem 'net-ldap', '~> 0.16.3'
+gem 'net-ldap', '~> 0.17.1'
 
 # API
 gem 'grape', '~> 1.5.2'
@@ -166,7 +166,7 @@ gem 'seed-fu', '~> 2.3.7'
 gem 'elasticsearch-model', '~> 7.2'
 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
 gem 'elasticsearch-api',   '7.13.3'
-gem 'aws-sdk-core', '~> 3.167.0'
+gem 'aws-sdk-core', '~> 3.167'
 gem 'aws-sdk-cloudformation', '~> 1'
 gem 'aws-sdk-s3', '~> 1.117.1'
 gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
@@ -223,7 +223,7 @@ gem 'redis-namespace', '~> 1.9.0'
 gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch'
 
 # Cron Parser
-gem 'fugit', '~> 1.2.1'
+gem 'fugit', '~> 1.7.0'
 
 # HTTP requests
 gem 'httparty', '~> 0.20.0'
@@ -352,119 +352,23 @@ gem 'batch-loader', '~> 2.0.1'
 gem 'peek', '~> 1.1'
 
 # Snowplow events tracking
-gem 'snowplow-tracker', '~> 0.6.1'
+gem 'snowplow-tracker', '~> 0.8.0'
 
 # Metrics
-gem 'webrick', '~> 1.6.1', require: false
+gem 'webrick', '~> 1.7.0', require: false
 gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client'
 
 gem 'warning', '~> 1.3.0'
 
-group :development do
-  gem 'lefthook', '~> 1.2.0', require: false
-  gem 'rubocop'
-  gem 'solargraph', '~> 0.47.2', require: false
-
-  gem 'letter_opener_web', '~> 2.0.0'
-  gem 'lookbook', '~> 1.2', '>= 1.2.1'
-
-  # Better errors handler
-  gem 'better_errors', '~> 2.9.1'
-
-  gem 'sprite-factory', '~> 1.7'
-end
-
-group :development, :test do
-  gem 'deprecation_toolkit', '~> 1.5.1', require: false
-  gem 'bullet', '~> 7.0.2'
-  gem 'pry-byebug'
-  gem 'pry-rails', '~> 0.3.9'
-  gem 'pry-shell', '~> 0.5.1'
-
-  gem 'awesome_print', require: false
-
-  gem 'database_cleaner', '~> 1.7.0'
-  gem 'factory_bot_rails', '~> 6.2.0'
-  gem 'rspec-rails', '~> 5.0.1'
-
-  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.11.0'
-
-  # Generate Fake data
-  gem 'ffaker', '~> 2.10'
-
-  gem 'spring', '~> 2.1.0'
-  gem 'spring-commands-rspec', '~> 1.0.4'
-
-  gem 'gitlab-styles', '~> 9.0.0', require: false
-
-  gem 'haml_lint', '~> 0.40.0', require: false
-  gem 'bundler-audit', '~> 0.7.0.1', require: false
-
-  # Benchmarking & profiling
-  gem 'benchmark-ips', '~> 2.3.0', require: false
-  gem 'benchmark-memory', '~> 0.1', require: false
-
-  gem 'knapsack', '~> 1.21.1'
-  gem 'crystalball', '~> 0.7.0', require: false
-
-  gem 'simple_po_parser', '~> 1.1.6', require: false
-
-  gem 'timecop', '~> 0.9.1'
-
-  gem 'png_quantizator', '~> 0.2.1', require: false
-
-  gem 'parallel', '~> 1.19', require: false
-
-  gem 'test_file_finder', '~> 0.1.3'
-
-  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup'
-
-  gem 'pact', '~> 1.63'
-end
-
 group :development, :test, :danger do
   gem 'gitlab-dangerfiles', '~> 3.6.2', require: false
 end
 
-group :development, :test, :coverage do
-  gem 'simplecov', '~> 0.21', require: false
-  gem 'simplecov-lcov', '~> 0.8.0', require: false
-  gem 'simplecov-cobertura', '~> 1.3.1', require: false
-  gem 'undercover', '~> 0.4.4', require: false
-end
-
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
   gem 'license_finder', '~> 7.0', require: false
 end
 
-group :test do
-  gem 'fuubar', '~> 2.2.0'
-  gem 'rspec-retry', '~> 0.6.1'
-  gem 'rspec_profiling', '~> 0.0.6'
-  gem 'rspec-benchmark', '~> 0.6.0'
-  gem 'rspec-parameterized', require: false
-
-  gem 'capybara', '~> 3.35.3'
-  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'
-  gem 'rails-controller-testing'
-  gem 'concurrent-ruby', '~> 1.1'
-  gem 'test-prof', '~> 1.0.7'
-  gem 'rspec_junit_formatter'
-  gem 'guard-rspec'
-
-  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
-  gem 'derailed_benchmarks', require: false
-end
-
 gem 'octokit', '~> 4.15'
 
 # Updating this gem version here is deprecated. See:
@@ -511,7 +415,7 @@ gem 'google-protobuf', '~> 3.21', '>= 3.21.9'
 gem 'toml-rb', '~> 2.2.0'
 
 # Feature toggles
-gem 'flipper', '~> 0.25.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'
@@ -547,7 +451,7 @@ gem 'lockbox', '~> 0.6.2'
 gem 'valid_email', '~> 0.1'
 
 # JSON
-gem 'json', '~> 2.5.1'
+gem 'json', '~> 2.6.2'
 gem 'json_schemer', '~> 0.2.18'
 gem 'oj', '~> 3.13.21'
 gem 'oj-introspect', '~> 0.7'
@@ -568,6 +472,8 @@ gem 'ed25519', '~> 1.3.0'
 # Error Tracking OpenAPI client
 # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
 gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api'
+
+gem 'parser'
 
 # Vulnerability advisories
 gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'