diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 03:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 03:08:47 +0000 |
| commit | cfbaef3f1c28cdb9b15615215b87167181cb210f (patch) | |
| tree | 8713f67e889a9b6d89fd35584ec7405f5a379565 /config | |
| parent | a97acfe57aac7d8206e99e5ffdfe9c5fb5b69544 (diff) | |
| download | gitlab-ce-cfbaef3f1c28cdb9b15615215b87167181cb210f.tar.gz | |
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 | ||||
| -rw-r--r-- | config/initializers/rails_host_authorization.rb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index e8cc35aed2a..be7d366c927 100644 --- a/config/application.rb +++ b/config/application.rb @@ -55,6 +55,8 @@ module Gitlab memo << ee_path.to_s end + ee_paths << "#{config.root}/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 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 |