summaryrefslogtreecommitdiff
path: root/qa/Dockerfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-10 18:06:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-10 18:06:00 +0000
commit7c862041c66833ebf49d9964f1797d93b1829690 (patch)
tree684a6603c6913e2c59c9bc7147d825ef35fc1b63 /qa/Dockerfile
parentd96abbee0b394ac40eb67253214fb9c41a31bd41 (diff)
downloadgitlab-ce-7c862041c66833ebf49d9964f1797d93b1829690.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/Dockerfile')
-rw-r--r--qa/Dockerfile1
1 files changed, 1 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