projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21030: Restore SET LOCAL enable_mergejoin to false
[arvados.git]
/
services
/
api
/
config
/
environment.rb
diff --git
a/services/api/config/environment.rb
b/services/api/config/environment.rb
index 402d79f574c5e1dcef3523fd93b7dc528f73be26..cd706940a389752fd6263bb32fc82a057fc3c583 100644
(file)
--- a/
services/api/config/environment.rb
+++ b/
services/api/config/environment.rb
@@
-1,6
+1,9
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
# Load the rails application
# Load the rails application
-require File.expand_path('../application', __FILE__)
-require 'josh_id'
+require_relative 'application'
# Initialize the rails application
# Initialize the rails application
-
Server::A
pplication.initialize!
+
Rails.a
pplication.initialize!