diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 00:08:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 00:08:55 +0300 |
| commit | 51612d3ef5be853289008694c40973b479e8547c (patch) | |
| tree | 0a74213e94c9b6d81f6f0cb01e0b5dbff26f5444 /config | |
| parent | ca05512007cea51e05d3431b2c8bd7228c754370 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/initializers/0_inflections.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index e8cc35aed2a..5241a195e53 100644 --- a/config/application.rb +++ b/config/application.rb @@ -55,6 +55,8 @@ module Gitlab memo << ee_path.to_s end + ee_paths << "ee/app/replicators" + # Eager load should load CE first config.eager_load_paths.push(*ee_paths) config.helpers_paths.push "#{config.root}/ee/app/helpers" diff --git a/config/initializers/0_inflections.rb b/config/initializers/0_inflections.rb index 7690eafdc6b..5c38859a667 100644 --- a/config/initializers/0_inflections.rb +++ b/config/initializers/0_inflections.rb @@ -19,6 +19,7 @@ ActiveSupport::Inflector.inflections do |inflect| group_view job_artifact_registry lfs_object_registry + package_file_registry project_auto_devops project_registry project_statistics |