Add latest changes from gitlab-org/gitlab@master

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