diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 18:06:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 18:06:00 +0000 |
commit | 7c862041c66833ebf49d9964f1797d93b1829690 (patch) | |
tree | 684a6603c6913e2c59c9bc7147d825ef35fc1b63 /qa | |
parent | d96abbee0b394ac40eb67253214fb9c41a31bd41 (diff) | |
download | gitlab-ce-7c862041c66833ebf49d9964f1797d93b1829690.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/Dockerfile | 1 | ||||
-rw-r--r-- | qa/qa.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index e695ab82969..4845938b57e 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -54,6 +54,7 @@ COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/co # The [b] part makes ./ee/app/models/license.r[b] a pattern that is allowed to return no files (which is the case in FOSS) COPY VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/ COPY ./lib/gitlab.rb /home/gitlab/lib/ +COPY ./lib/gitlab/utils.rb /home/gitlab/lib/gitlab/ COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/ RUN cd /home/gitlab/qa/ && bundle install --jobs=$(nproc) --retry=3 --quiet COPY ./qa /home/gitlab/qa @@ -5,6 +5,7 @@ $: << File.expand_path(File.dirname(__FILE__)) Encoding.default_external = 'UTF-8' require_relative '../lib/gitlab' +require_relative '../lib/gitlab/utils' require_relative '../config/initializers/0_inject_enterprise_edition_module' module QA |