summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-01-02 09:49:57 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-01-02 09:49:57 +0000
commitdab5eaf8da36e1094dbd10691acce119d6d77233 (patch)
tree804f5fccc7b80f11d3598283792d547433f61ff9 /qa
parenta0a12ee5a14f2d5e363749dddbcaa58582fa743d (diff)
parent5542f3d3cc2753516e75d0ea5290ab018e2c12e1 (diff)
downloadgitlab-ce-dab5eaf8da36e1094dbd10691acce119d6d77233.tar.gz
Merge branch 'sh-bump-qa-image-ruby-2.5' into 'master'
Upgrade GitLab QA image to Ruby 2.5 See merge request gitlab-org/gitlab-ce!24091
Diffstat (limited to 'qa')
-rw-r--r--qa/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 9956ced0ef6..ca7f9accb70 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4-stretch
+FROM ruby:2.5-stretch
LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>"
ENV DEBIAN_FRONTEND noninteractive