diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:07:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:07:57 +0300 |
| commit | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (patch) | |
| tree | 9d93267209387e62d23ea7abf81ef9c0d64f2f0b /config | |
| parent | a325f3a104748ecc68df7c3d793940aa709a111f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 7 | ||||
| -rw-r--r-- | config/initializers_before_autoloader/000_inflections.rb (renamed from config/initializers/0_inflections.rb) | 0 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 2f4d271322f..d0bb411c3cc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -292,6 +292,13 @@ module Gitlab initializer :move_initializers, before: :load_config_initializers, after: :let_zeitwerk_take_over do end + # We need this for initializers that need to be run before Zeitwerk is loaded + initializer :before_zeitwerk, before: :let_zeitwerk_take_over, after: :prepend_helpers_path do + Dir[Rails.root.join('config/initializers_before_autoloader/*.rb')].sort.each do |initializer| + load_config_initializer(initializer) + end + end + config.after_initialize do Rails.application.reload_routes! diff --git a/config/initializers/0_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb index 1fabce9a57e..1fabce9a57e 100644 --- a/config/initializers/0_inflections.rb +++ b/config/initializers_before_autoloader/000_inflections.rb |