summaryrefslogtreecommitdiff
path: root/scripts/setup-test-env
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-03 03:14:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-03 03:14:42 +0000
commitc657078ecb4bff69e58f6911713e143c99f2c71f (patch)
tree5a4dc8bf80b14c3202de9c7bd51363f3d73af541 /scripts/setup-test-env
parent498ba9dc41fcf2b4be30a8f3721543953efb3c3b (diff)
downloadgitlab-ce-c657078ecb4bff69e58f6911713e143c99f2c71f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/setup-test-env')
-rwxr-xr-xscripts/setup-test-env12
1 files changed, 1 insertions, 11 deletions
diff --git a/scripts/setup-test-env b/scripts/setup-test-env
index a81aaa5cda3..c955a01d769 100755
--- a/scripts/setup-test-env
+++ b/scripts/setup-test-env
@@ -13,17 +13,7 @@ require 'active_support/string_inquirer'
ENV['SKIP_RAILS_ENV_IN_RAKE'] = 'true'
-module Rails
- extend self
-
- def root
- Pathname.new(File.expand_path('..', __dir__))
- end
-
- def env
- @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "test")
- end
-end
+require_relative 'override_rails_constants'
ActiveSupport::Dependencies.autoload_paths << 'lib'