diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 18:08:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 18:08:48 +0300 |
| commit | eabf8fd774fef6a54903e5141138f47bdafeb331 (patch) | |
| tree | c74ff99fa6765cbe091767e9827374ce44b0df50 /config | |
| parent | 20d564f1064622ef0623434372ac3ceb03173331 (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, 0 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 5241a195e53..e8cc35aed2a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -55,8 +55,6 @@ 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 5c38859a667..7690eafdc6b 100644 --- a/config/initializers/0_inflections.rb +++ b/config/initializers/0_inflections.rb @@ -19,7 +19,6 @@ ActiveSupport::Inflector.inflections do |inflect| group_view job_artifact_registry lfs_object_registry - package_file_registry project_auto_devops project_registry project_statistics |