Add latest changes from gitlab-org/gitlab@master

6 files changed, 9 insertions, 63 deletions

diff --git a/config/application.rb b/config/application.rb
index e1be913b5c3..14e92bf5905 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,8 +32,6 @@ module Gitlab
 
     config.active_record.sqlite3.represent_boolean_as_integer = true
 
-    config.autoloader = :zeitwerk
-
     # Sidekiq uses eager loading, but directories not in the standard Rails
     # directories must be added to the eager load paths:
     # https://github.com/mperham/sidekiq/wiki/FAQ#why-doesnt-sidekiq-autoload-my-rails-application-code
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c42d7127a22..25d57467060 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -42,7 +42,7 @@ Rails.application.configure do
   config.action_mailer.raise_delivery_errors = true
   # Don't make a mess when bootstrapping a development environment
   config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1')
-  config.action_mailer.preview_path = Rails.root.join('app', 'mailers', 'previews')
+  config.action_mailer.preview_path = 'app/mailers/previews'
 
   config.eager_load = false
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index f8fb7f60f0d..71cd5200415 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -43,7 +43,7 @@ Rails.application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 
-  config.eager_load = false
+  config.eager_load = true
 
   config.cache_store = :null_store
 
diff --git a/config/initializers/2_gitlab.rb b/config/initializers/2_gitlab.rb
new file mode 100644
index 00000000000..8b7f245b7b0
--- /dev/null
+++ b/config/initializers/2_gitlab.rb
@@ -0,0 +1 @@
+require_dependency 'gitlab'
diff --git a/config/initializers_before_autoloader/002_zeitwerk.rb b/config/initializers_before_autoloader/002_zeitwerk.rb
deleted file mode 100644
index df0c16b0bc0..00000000000
--- a/config/initializers_before_autoloader/002_zeitwerk.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-Rails.autoloaders.each do |autoloader|
-  # We need to ignore these since these are non-Ruby files
-  # that do not define Ruby classes / modules
-  autoloader.ignore(Rails.root.join('lib/support'))
-  # Ignore generators since these are loaded manually by Rails
-  autoloader.ignore(Rails.root.join('lib/generators'))
-  autoloader.ignore(Rails.root.join('ee/lib/generators')) if Gitlab.ee?
-  # Mailer previews are also loaded manually by Rails
-  autoloader.ignore(Rails.root.join('app/mailers/previews'))
-  autoloader.ignore(Rails.root.join('ee/app/mailers/previews')) if Gitlab.ee?
-  # Ignore these files because these are only used in Rake tasks
-  # and are not available in production
-  autoloader.ignore(Rails.root.join('lib/gitlab/graphql/docs'))
-
-  autoloader.inflector.inflect(
-    'authenticates_2fa_for_admin_mode' => 'Authenticates2FAForAdminMode',
-    'api' => 'API',
-    'api_guard' => 'APIGuard',
-    'group_api_compatibility' => 'GroupAPICompatibility',
-    'project_api_compatibility' => 'ProjectAPICompatibility',
-    'cte' => 'CTE',
-    'recursive_cte' => 'RecursiveCTE',
-    'cidr' => 'CIDR',
-    'cli' => 'CLI',
-    'dn' => 'DN',
-    'hmac_token' => 'HMACToken',
-    'html' => 'HTML',
-    'html_parser' => 'HTMLParser',
-    'html_gitlab' => 'HTMLGitlab',
-    'http' => 'HTTP',
-    'http_connection_adapter' => 'HTTPConnectionAdapter',
-    'http_clone_enabled_check' => 'HTTPCloneEnabledCheck',
-    'chunked_io' => 'ChunkedIO',
-    'http_io' => 'HttpIO',
-    'json' => 'JSON',
-    'json_formatter' => 'JSONFormatter',
-    'json_web_token' => 'JSONWebToken',
-    'as_json' => 'AsJSON',
-    'ldap_key' => 'LDAPKey',
-    'mr_note' => 'MRNote',
-    'pdf' => 'PDF',
-    'rsa_token' => 'RSAToken',
-    'san_extension' => 'SANExtension',
-    'sca' => 'SCA',
-    'spdx' => 'SPDX',
-    'sql' => 'SQL',
-    'ssh_key' => 'SSHKey',
-    'ssh_key_with_user' => 'SSHKeyWithUser',
-    'ssh_public_key' => 'SSHPublicKey',
-    'git_push_ssh_proxy' => 'GitPushSSHProxy',
-    'git_user_default_ssh_config_check' => 'GitUserDefaultSSHConfigCheck',
-    'binary_stl' => 'BinarySTL',
-    'text_stl' => 'TextSTL',
-    'svg' => 'SVG',
-    'function_uri' => 'FunctionURI'
-  )
-end
diff --git a/config/settings.rb b/config/settings.rb
index a9e91ce22d7..144a068ef2a 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -3,6 +3,12 @@
 require 'settingslogic'
 require 'digest/md5'
 
+# We can not use `Rails.root` here, as this file might be loaded without the
+# full Rails environment being loaded. We can not use `require_relative` either,
+# as Rails uses `load` for `require_dependency` (used when loading the Rails
+# environment). This could then lead to this file being loaded twice.
+require_dependency File.expand_path('../lib/gitlab', __dir__)
+
 class Settings < Settingslogic
   source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') }
   namespace ENV.fetch('GITLAB_ENV') { Rails.env }