diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 18:05:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 18:05:56 +0000 |
| commit | 40597fdec080d55d36e97aab1a0b98dfc35517b9 (patch) | |
| tree | 20cb97ab39cd511c22657cc23c5834464001feac /config/application.rb | |
| parent | a712542edb9d52105409462de3e56d2a6d6f6c7a (diff) | |
| download | gitlab-ce-40597fdec080d55d36e97aab1a0b98dfc35517b9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/config/application.rb b/config/application.rb index 192e836594a..5d7c52c5d81 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,7 +22,6 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/current_settings') require_dependency Rails.root.join('lib/gitlab/middleware/read_only') require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check') - require_dependency Rails.root.join('config/light_settings') # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -63,15 +62,6 @@ module Gitlab config.paths['app/views'].unshift "#{config.root}/ee/app/views" end - if LightSettings.com? - com_paths = config.eager_load_paths.each_with_object([]) do |path, memo| - com_path = config.root.join('com', Pathname.new(path).relative_path_from(config.root)) - memo << com_path.to_s - end - - config.eager_load_paths.push(*com_paths) - end - # Rake tasks ignore the eager loading settings, so we need to set the # autoload paths explicitly config.autoload_paths = config.eager_load_paths.dup |