summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-08-02 16:25:30 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-08-02 16:25:30 +0000
commit8374dd565d44e5f97c179dcb4cf03c7d3ea69363 (patch)
tree204df919644c90c1a18b7e676fd48c982ce95593 /qa
parentb7b8c39583595cfc610079b5d8193b3d51883ffd (diff)
parent27194e08525fa2ef43aa9f3dbfda378a7b1258bd (diff)
downloadgitlab-ce-8374dd565d44e5f97c179dcb4cf03c7d3ea69363.tar.gz
Merge branch 'backport-fix-remaining-prepend-lines' into 'master'
Support X_if_ee methods for QA tests See merge request gitlab-org/gitlab-ce!31379
Diffstat (limited to 'qa')
-rw-r--r--qa/qa.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index 18fb4509dce..8be2a289422 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -4,6 +4,9 @@ $: << File.expand_path(File.dirname(__FILE__))
Encoding.default_external = 'UTF-8'
+require_relative '../lib/gitlab'
+require_relative '../config/initializers/0_inject_enterprise_edition_module'
+
module QA
##
# GitLab QA runtime classes, mostly singletons.