summaryrefslogtreecommitdiff
path: root/qa/qa.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-08-19 13:50:15 +0000
committerRémy Coutable <remy@rymai.me>2019-08-19 13:50:15 +0000
commit4d4e88df01554336daf245a68653b80ca00989a5 (patch)
tree58a8eda577bdf785153cde858c939ee1a5200b65 /qa/qa.rb
parentb1905a396f7e7da89280aea4436eb7261d1cd34c (diff)
parent9a4dcd8dc898d79965fa96ae8941bfaa7333019d (diff)
downloadgitlab-ce-4d4e88df01554336daf245a68653b80ca00989a5.tar.gz
Merge branch 'qa-backport-fix-remaining-prepend-lines' into 'master'
Update qa/Dockerfile to be built from the project root context See merge request gitlab-org/gitlab-ce!31533
Diffstat (limited to 'qa/qa.rb')
-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.