diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 21:05:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 21:05:56 +0300 |
| commit | 40597fdec080d55d36e97aab1a0b98dfc35517b9 (patch) | |
| tree | 20cb97ab39cd511c22657cc23c5834464001feac /spec/fast_spec_helper.rb | |
| parent | a712542edb9d52105409462de3e56d2a6d6f6c7a (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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index 3fe3f9ff9a9..1a8af335244 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -7,12 +7,10 @@ ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true' require 'active_support/dependencies' require_relative '../config/initializers/0_inject_enterprise_edition_module' -require_relative '../config/initializers/0_inject_com_module' 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 << 'com/lib' ActiveSupport::XmlMini.backend = 'Nokogiri' |