Add latest changes from gitlab-org/gitlab@master

5 files changed, 76 insertions, 3 deletions

diff --git a/config/application.rb b/config/application.rb
index 5e350cb80dd..181b216f444 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,6 +32,8 @@ module Gitlab
     require_dependency Rails.root.join('lib/gitlab/middleware/rack_multipart_tempfile_factory')
     require_dependency Rails.root.join('lib/gitlab/runtime')
 
+    config.autoloader = :classic
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 50d394859bc..92de88394c6 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -50,7 +50,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 = 'app/mailers/previews'
+  config.action_mailer.preview_path = "#{Rails.root}{/ee,}/app/mailers/previews"
 
   config.eager_load = false
 
diff --git a/config/initializers/0_runtime_identify.rb b/config/initializers/9_runtime_identify.rb
index e6be19ffb79..c5efc9b17cb 100644
--- a/config/initializers/0_runtime_identify.rb
+++ b/config/initializers/9_runtime_identify.rb
@@ -7,7 +7,7 @@ rescue Gitlab::Runtime::IdentificationError => e
   \n!! RUNTIME IDENTIFICATION FAILED: #{e}
   Runtime based configuration settings may not work properly.
   If you continue to see this error, please file an issue via
-  https://gitlab.com/gitlab-org/gitlab/issues/new
+  https://gitlab.com/gitlab-org/gitlab/-/issues/new
   NOTICE
   Gitlab::AppLogger.error(message)
   Gitlab::ErrorTracking.track_exception(e)
diff --git a/config/initializers/global_id.rb b/config/initializers/global_id.rb
index 8f1b8f2aeeb..c3ab9f10c08 100644
--- a/config/initializers/global_id.rb
+++ b/config/initializers/global_id.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-GlobalID.prepend(Gitlab::Patch::GlobalID)
+GlobalID.prepend(Gitlab::Patch::GlobalId)
diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb
new file mode 100644
index 00000000000..d576e21f173
--- /dev/null
+++ b/config/initializers_before_autoloader/004_zeitwerk.rb
@@ -0,0 +1,71 @@
+# 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
+  # https://github.com/rails/rails/blob/v6.1.3.2/railties/lib/rails/command/behavior.rb#L56-L65
+  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
+  # https://github.com/rails/rails/blob/v6.1.3.2/actionmailer/lib/action_mailer/preview.rb#L121-L125
+  autoloader.ignore(Rails.root.join('app/mailers/previews'))
+  autoloader.ignore(Rails.root.join('ee/app/mailers/previews')) if Gitlab.ee?
+
+  autoloader.inflector.inflect(
+    'api' => 'API',
+    'api_authentication' => 'APIAuthentication',
+    'api_guard' => 'APIGuard',
+    'group_api_compatibility' => 'GroupAPICompatibility',
+    'project_api_compatibility' => 'ProjectAPICompatibility',
+    'ast' => 'AST',
+    'cte' => 'CTE',
+    'recursive_cte' => 'RecursiveCTE',
+    'cidr' => 'CIDR',
+    'cli' => 'CLI',
+    'dn' => 'DN',
+    'global_id_type' => 'GlobalIDType',
+    'global_id_compatibility' => 'GlobalIDCompatibility',
+    'hll' => 'HLL',
+    'hll_redis_counter' => 'HLLRedisCounter',
+    'redis_hll_metric' => 'RedisHLLMetric',
+    'hmac_token' => 'HMACToken',
+    'html' => 'HTML',
+    'html_parser' => 'HTMLParser',
+    'html_gitlab' => 'HTMLGitlab',
+    'http' => 'HTTP',
+    'http_connection_adapter' => 'HTTPConnectionAdapter',
+    'http_clone_enabled_check' => 'HTTPCloneEnabledCheck',
+    'hangouts_chat_http_override' => 'HangoutsChatHTTPOverride',
+    'chunked_io' => 'ChunkedIO',
+    'http_io' => 'HttpIO',
+    'json_formatter' => 'JSONFormatter',
+    'json_web_token' => 'JSONWebToken',
+    'as_json' => 'AsJSON',
+    'jwt_token' => 'JWTToken',
+    'ldap_key' => 'LDAPKey',
+    'mr_note' => 'MRNote',
+    'pdf' => 'PDF',
+    'rsa_token' => 'RSAToken',
+    'san_extension' => 'SANExtension',
+    'sca' => 'SCA',
+    'spdx' => 'SPDX',
+    'sql' => 'SQL',
+    'sse_helpers' => 'SSEHelpers',
+    'ssh_key' => 'SSHKey',
+    'ssh_key_with_user' => 'SSHKeyWithUser',
+    'ssh_public_key' => 'SSHPublicKey',
+    'git_ssh_proxy' => 'GitSSHProxy',
+    'git_user_default_ssh_config_check' => 'GitUserDefaultSSHConfigCheck',
+    'binary_stl' => 'BinarySTL',
+    'text_stl' => 'TextSTL',
+    'svg' => 'SVG',
+    'function_uri' => 'FunctionURI',
+    'uuid' => 'UUID',
+    'vulnerability_uuid' => 'VulnerabilityUUID',
+    'vs_code_extension_activity_unique_counter' => 'VSCodeExtensionActivityUniqueCounter'
+  )
+end