diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /config/initializers_before_autoloader | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'config/initializers_before_autoloader')
| -rw-r--r-- | config/initializers_before_autoloader/004_zeitwerk.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb index 18dfa2e9f40..4d8dcf4de6b 100644 --- a/config/initializers_before_autoloader/004_zeitwerk.rb +++ b/config/initializers_before_autoloader/004_zeitwerk.rb @@ -4,16 +4,13 @@ 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')) + autoloader.ignore(Rails.root.join('ee/lib/ee/gitlab/ci/parsers/security/validators/schemas')) if Gitlab.ee? - # 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 + # Mailer previews are 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.ignore(Rails.root.join('jh/app/mailers/previews')) if Gitlab.jh? autoloader.inflector.inflect( 'api' => 'API', |