--- Gemfile.orig	2022-08-01 14:56:36 UTC
+++ Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.1.4.7'
+gem 'rails', '~> 6.1.4'
 
 gem 'bootsnap', '~> 1.12.0', require: false
 
@@ -29,35 +29,35 @@ gem 'marginalia', '~> 1.10.0'
 gem 'declarative_policy', '~> 1.1.0'
 
 # Authentication libraries
-gem 'devise', '~> 4.7.2'
+gem 'devise', '~> 4.7'
 gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable'
 gem 'bcrypt', '~> 3.1', '>= 3.1.14'
 gem 'doorkeeper', '~> 5.5.0.rc2'
 gem 'doorkeeper-openid_connect', '~> 1.7.5'
 gem 'rexml', '~> 3.2.5'
 gem 'ruby-saml', '~> 1.13.0'
-gem 'omniauth', '~> 1.8'
-gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth', '>= 1.8'
+gem 'omniauth-auth0', '~> 3.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-dingtalk-oauth2', '~> 1.0'
 gem 'omniauth-alicloud', '~> 1.0.1'
-gem 'omniauth-facebook', '~> 4.0.0'
-gem 'omniauth-github', '~> 1.4'
+gem 'omniauth-facebook', '>= 4.0.0'
+gem 'omniauth-github', '>= 1.4'
 gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
 gem 'omniauth-google-oauth2', '~> 0.6.0'
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
-gem 'omniauth-saml', '~> 1.10'
+gem 'omniauth-saml', '~> 2.1.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
 gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
+gem 'gitlab-omniauth-openid-connect', '~> 0.10.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 'jwt', '~> 2.1.0'
+gem 'jwt', '~> 2.1'
 
 # Kerberos authentication. EE-only
 gem 'gssapi', group: :kerberos
@@ -93,7 +93,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.16'
 
 # API
 gem 'grape', '~> 1.5.2'
@@ -205,10 +205,10 @@ gem 'redis-namespace', '~> 1.8.1'
 gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
 
 # Cron Parser
-gem 'fugit', '~> 1.2.1'
+gem 'fugit', '~> 1.2'
 
 # HTTP requests
-gem 'httparty', '~> 0.16.4'
+gem 'httparty', '~> 0.16'
 
 # Colored output to console
 gem 'rainbow', '~> 3.0'
@@ -233,7 +233,7 @@ gem 'js_regex', '~> 3.7'
 gem 'device_detector'
 
 # Redis
-gem 'redis', '~> 4.4.0'
+gem 'redis', '~> 4.4'
 gem 'connection_pool', '~> 2.0'
 
 # Redis session store
@@ -335,89 +335,19 @@ gem 'batch-loader', '~> 2.0.1'
 gem 'peek', '~> 1.1'
 
 # Snowplow events tracking
-gem 'snowplow-tracker', '~> 0.6.1'
+gem 'snowplow-tracker', '~> 0.6'
 
 # Metrics
 gem 'method_source', '~> 1.0', require: false
-gem 'webrick', '~> 1.6.1', require: false
+gem 'webrick', '~> 1.6', require: false
 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 'rubocop'
-  gem 'solargraph', '~> 0.44.3', require: false
-
-  gem 'letter_opener_web', '~> 2.0.0'
-
-  # 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 'pry-byebug'
-  gem 'pry-rails', '~> 0.3.9'
-  gem 'pry-shell', '~> 0.5.0'
-
-  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', '~> 7.1.0', require: false
-
-  gem 'haml_lint', '~> 0.36.0', require: false
-  gem 'bundler-audit', '~> 0.7.0.1', require: false
-
-  gem 'benchmark-ips', '~> 2.3.0', 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.12'
-end
-
 group :development, :test, :danger do
   gem 'gitlab-dangerfiles', '~> 3.4.3', 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
   # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
@@ -426,30 +356,6 @@ group :development, :test, :omnibus do
   gem 'gitlab-license_finder', '~> 6.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 '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:
@@ -534,7 +440,7 @@ gem 'lockbox', '~> 0.6.2'
 gem 'valid_email', '~> 0.1'
 
 # JSON
-gem 'json', '~> 2.5.1'
+gem 'json', '~> 2.5'
 gem 'json_schemer', '~> 0.2.18'
 gem 'oj', '~> 3.13.19'
 gem 'multi_json', '~> 1.14.1'
@@ -554,3 +460,6 @@ 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'
+