14287: Merge branch 'master'

[arvados.git] / services / api / config / initializers / preload_all_models.rb

diff --git a/services/api/config/initializers/preload_all_models.rb b/services/api/config/initializers/preload_all_models.rb
index 7e2612377434b9e3bfc245a8b4dc6143d6ad00c6..713c61fd75a6e75794b31afa7a1d6ca3f6005a43 100644 (file)
--- a/services/api/config/initializers/preload_all_models.rb
+++ b/services/api/config/initializers/preload_all_models.rb
@@ -1,12 +1,15 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 # See http://aaronvb.com/articles/37-rails-caching-and-undefined-class-module
 
 # Config must be done before we load model class files; otherwise they
 # won't be able to use Rails.configuration.* to initialize their
 # classes.
-require_relative 'load_config.rb'
 
 if Rails.env == 'development'
   Dir.foreach("#{Rails.root}/app/models") do |model_file|
-    require_dependency model_file if model_file.match /\.rb$/
+    require_dependency model_file if model_file.match(/\.rb$/)
   end
 end