projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16470-wb-rails-52'
[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
# 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
require 'josh_id'
# Initialize the rails application
-
Server::A
pplication.initialize!
+
Rails.a
pplication.initialize!