diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
| commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
| tree | b6505abedcd965ebae5118b504b185b63129dc4c /spec/fast_spec_helper.rb | |
| parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fast_spec_helper.rb')
| -rw-r--r-- | spec/fast_spec_helper.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index 1a8af335244..366c201bfe3 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -11,6 +11,9 @@ require_relative '../config/settings' require_relative 'support/rspec' require 'active_support/all' -ActiveSupport::Dependencies.autoload_paths << 'lib' -ActiveSupport::Dependencies.autoload_paths << 'ee/lib' +unless ActiveSupport::Dependencies.autoload_paths.frozen? + ActiveSupport::Dependencies.autoload_paths << 'lib' + ActiveSupport::Dependencies.autoload_paths << 'ee/lib' +end + ActiveSupport::XmlMini.backend = 'Nokogiri' |