Merge branch 'master' into 14946-ruby-2.5

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

diff --git a/services/api/config/environment.rb b/services/api/config/environment.rb
index e24eee035cd2c8f0d01c5b708c43f9d870a1fc71..b82ba27f9ae1bd390bdb71c0fd4f79c9c1fb4b70 100644 (file)
--- a/services/api/config/environment.rb
+++ b/services/api/config/environment.rb
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 require 'josh_id'
 
 # Initialize the rails application
-Server::Application.initialize!
+Rails.application.initialize!