diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-05 15:08:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-05 15:08:23 +0000 |
commit | 86e1f47cd19e7c164fb0b2c24e28a63ea27ae5ff (patch) | |
tree | 016d11e5f9df14b69e28475641160c8a843cbc34 /config/application.rb | |
parent | 38b39c50473ba58a80ddad5c22c96ccd5128ddfb (diff) | |
download | gitlab-ce-86e1f47cd19e7c164fb0b2c24e28a63ea27ae5ff.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index df1ff971203..d0c211bf608 100644 --- a/config/application.rb +++ b/config/application.rb @@ -301,7 +301,10 @@ module Gitlab end config.after_initialize do - Rails.application.reload_routes! + # Devise (see initializers/8_devise.rb) already reloads routes if + # eager loading is enabled, so don't do this twice since it's + # expensive. + Rails.application.reload_routes! unless config.eager_load project_url_helpers = Module.new do extend ActiveSupport::Concern |