diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /spec/fast_spec_helper.rb | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
| download | gitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/fast_spec_helper.rb')
| -rw-r--r-- | spec/fast_spec_helper.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index cd20019115d..b06ebba3f6c 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -18,9 +18,11 @@ require_relative '../config/settings' require_relative 'support/rspec' require 'active_support/all' -ActiveSupport::Dependencies.autoload_paths << 'lib' -ActiveSupport::Dependencies.autoload_paths << 'ee/lib' -ActiveSupport::Dependencies.autoload_paths << 'jh/lib' +unless ActiveSupport::Dependencies.autoload_paths.frozen? + ActiveSupport::Dependencies.autoload_paths << 'lib' + ActiveSupport::Dependencies.autoload_paths << 'ee/lib' + ActiveSupport::Dependencies.autoload_paths << 'jh/lib' +end ActiveSupport::XmlMini.backend = 'Nokogiri' |