diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 03:09:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 03:09:27 +0300 |
| commit | 77d15aff0eaa7dd8a8ce988436a502c5ab6bb55b (patch) | |
| tree | 7e5a828e67a98dbb3b7eb1f73b569d15bbcf0f45 /spec/fast_spec_helper.rb | |
| parent | 8b5c2a4525819c6b18f422b4baa0f6568286909b (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, 2 insertions, 5 deletions
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index 366c201bfe3..1a8af335244 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -11,9 +11,6 @@ require_relative '../config/settings' require_relative 'support/rspec' require 'active_support/all' -unless ActiveSupport::Dependencies.autoload_paths.frozen? - ActiveSupport::Dependencies.autoload_paths << 'lib' - ActiveSupport::Dependencies.autoload_paths << 'ee/lib' -end - +ActiveSupport::Dependencies.autoload_paths << 'lib' +ActiveSupport::Dependencies.autoload_paths << 'ee/lib' ActiveSupport::XmlMini.backend = 'Nokogiri' |