17778: Merge branch 'master' into 17778-doc-update

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

diff --git a/services/api/config/environment.rb b/services/api/config/environment.rb
index 9ef3a4a496e10b518ae96cd21a67e7adb5235134..cd706940a389752fd6263bb32fc82a057fc3c583 100644 (file)
--- a/services/api/config/environment.rb
+++ b/services/api/config/environment.rb
@@ -1,7 +1,9 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 # Load the rails application
-require File.expand_path('../application', __FILE__)
-require 'josh_id'
+require_relative 'application'
 
 # Initialize the rails application
-Server::Application.initialize!
-Rails.cache.clear
+Rails.application.initialize!