diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /qa/qa.rb | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'qa/qa.rb')
-rw-r--r-- | qa/qa.rb | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -17,10 +17,16 @@ require 'active_support/core_ext/hash' require 'active_support/core_ext/object/blank' require 'rainbow/refinement' +require_relative 'qa/support/fips' + module QA root = "#{__dir__}/qa" loader = Zeitwerk::Loader.new + + # require jh/qa/qa.rb first, to load JH module make prepend module works + require '../jh/qa/qa' if GitlabEdition.jh? + loader.push_dir(root, namespace: QA) loader.ignore("#{root}/specs/features") |