projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21316: Merge commit '1416f698b72de4b09350d9c2fb25c1405c3247bc' into 21316-left-panel...
[arvados.git]
/
services
/
api
/
config
/
environment.rb
diff --git
a/services/api/config/environment.rb
b/services/api/config/environment.rb
index 402d79f574c5e1dcef3523fd93b7dc528f73be26..cac5315775258a68f5e18885605d3fb1b758319e 100644
(file)
--- a/
services/api/config/environment.rb
+++ b/
services/api/config/environment.rb
@@
-1,6
+1,5
@@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-require 'josh_id'
+# Load the Rails application.
+require_relative "application"
-# Initialize the
rails application
-
Server::A
pplication.initialize!
+# Initialize the
Rails application.
+
Rails.a
pplication.initialize!