Merge branch 'master' into 14946-ruby-2.5

[arvados.git] / services / api / config / application.rb

diff --git a/services/api/config/application.rb b/services/api/config/application.rb
index d6fcc9ea09be03a321d89318c8b0bf9c442a4abe..9a4270ad9df4384d88c97cf100ae83790a1a35ba 100644 (file)
--- a/services/api/config/application.rb
+++ b/services/api/config/application.rb
@@ -45,6 +45,8 @@ module Server
     # The following is to avoid SafeYAML's warning message
     SafeYAML::OPTIONS[:default_mode] = :safe
 
+    require_relative "arvados_config.rb"
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.