diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-12-15 09:29:39 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-12-15 09:29:39 +0000 |
commit | 8b436fb8f87878264508c78471e3e71e2d024aa0 (patch) | |
tree | 27111898e39c547f03e7970d4a593451b46fb238 /config | |
parent | 1baea77438779e74657b49ca26810d6c8f041b41 (diff) | |
parent | 9b00203904d9e8a98018ec6bd193054ffffb60c6 (diff) | |
download | gitlab-ce-8b436fb8f87878264508c78471e3e71e2d024aa0.tar.gz |
Merge branch 'backport-ee-3706' into 'master'
Add eager-load paths to autoload paths to fix Rake tasks
See merge request gitlab-org/gitlab-ce!15940
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 6436f887d14..25c5a8f5a99 100644 --- a/config/application.rb +++ b/config/application.rb @@ -34,6 +34,10 @@ module Gitlab config.generators.templates.push("#{config.root}/generator_templates") + # Rake tasks ignore the eager loading settings, so we need to set the + # autoload paths explicitly + config.autoload_paths = config.eager_load_paths.dup + # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. # config.plugins = [ :exception_notification, :ssl_requirement, :all ] |