From cfbaef3f1c28cdb9b15615215b87167181cb210f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 6 Feb 2020 03:08:47 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

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

(limited to 'config/initializers')

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
diff --git a/config/initializers/rails_host_authorization.rb b/config/initializers/rails_host_authorization.rb
index 6afcec374db..3be2de47812 100644
--- a/config/initializers/rails_host_authorization.rb
+++ b/config/initializers/rails_host_authorization.rb
@@ -3,5 +3,5 @@
 # This file requires config/initializers/1_settings.rb
 
 if Rails.env.development?
-  Rails.application.config.hosts << Gitlab.config.gitlab.host
+  Rails.application.config.hosts += [Gitlab.config.gitlab.host, 'unix']
 end
-- 
cgit v1.2.3