diff --git a/Changelog.md b/Changelog.md index 3b93d113..d59a842f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - Update gitaly to 1.47.0 - Update gitlab-shell to 9.3.0 - Update gitlab-pages to 1.6.1 +- ruby: update to 2.6 **11.11.3** - gitlab: upgrade CE to v11.11.3 diff --git a/Dockerfile b/Dockerfile index 22cac6d3..c22b5427 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF ARG VERSION=12.0.0 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.5 \ + RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.6 \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \