From 51612d3ef5be853289008694c40973b479e8547c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 4 Feb 2020 21:08:55 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 config/application.rb                | 2 ++
 config/initializers/0_inflections.rb | 1 +
 2 files changed, 3 insertions(+)

(limited to 'config')

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
-- 
cgit v1.2.3