projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10649-squeue-stderr' closes #10649
[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 1a76b72ed320f8ee9e2f261f1b2efb9b74eb9920..1ae531c169af05428f390953a344b1d24cafa4b0 100644
(file)
--- a/
services/api/config/initializers/preload_all_models.rb
+++ b/
services/api/config/initializers/preload_all_models.rb
@@
-1,7
+1,12
@@
# See http://aaronvb.com/articles/37-rails-caching-and-undefined-class-module
# 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|
if Rails.env == 'development'
Dir.foreach("#{Rails.root}/app/models") do |model_file|
- require_dependency model_file if model_file.match
/\.rb$/
- end
+ require_dependency model_file if model_file.match
(/\.rb$/)
+ end
end
end