projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14946-ruby-2.5
[arvados.git]
/
services
/
api
/
config
/
boot.rb
diff --git
a/services/api/config/boot.rb
b/services/api/config/boot.rb
index c70ab9591fe76ec2a8b19a4d32096e95d473d722..717101c2b2b6ccbacb9e01c587195b38e1bd8bb4 100644
(file)
--- a/
services/api/config/boot.rb
+++ b/
services/api/config/boot.rb
@@
-2,9
+2,7
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-require 'rubygems'
-
# Set up gems listed in the Gemfile.
# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../
../Gemfile', __FILE
__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../
Gemfile', __dir
__)
-require 'bundler/setup'
if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup'