diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-11 21:11:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-11 21:11:57 +0300 |
| commit | 603ee53dbdbd3adaced752e1a119eb40d64e9979 (patch) | |
| tree | 7c3e912fe4c02ea464063a4a224b02bbcdeea580 /spec/spec_helper.rb | |
| parent | c79523e3952dad31a9ab8ccbb9e38466fec3aec3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1b3ff4bf2b9..8acf3bcf9c0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -53,10 +53,8 @@ end require 'rainbow/ext/string' Rainbow.enabled = false -# Require JH first because we need override some EE methods with JH methods, -# if we load EE first, we can't find JH modules in prepend_mod method -require_relative('../jh/spec/spec_helper') if Gitlab.jh? require_relative('../ee/spec/spec_helper') if Gitlab.ee? +require_relative('../jh/spec/spec_helper') if Gitlab.jh? # Requires supporting ruby files with custom matchers and macros, etc, # in spec/support/ and its subdirectories. |