diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-21 21:15:19 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-21 21:15:19 +0000 |
| commit | 82e31ee46784cc4a0b987511ce7506dd01a3f004 (patch) | |
| tree | ca18f77a0fbe8c10371b912b301b4cf64aa204be | |
| parent | ff7c8cd44d1516b0cfef2f0ade7d1012ac85f204 (diff) | |
| parent | 5cdd246bd994b09815a14d550c2c334cc48aa35a (diff) | |
| download | gitlab-ce-82e31ee46784cc4a0b987511ce7506dd01a3f004.tar.gz | |
Merge branch '41268-bump-ruby-to-2-3-6' into 'master'
Resolve "Bump Ruby to 2.3.6"
See merge request gitlab-org/gitlab-ce!16016
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/41268-bump-ruby-to-2-3-6.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c26e7f0aeba..edb1069e54f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6" .dedicated-runner: &dedicated-runner retry: 1 diff --git a/.ruby-version b/.ruby-version index cc6c9a491e0..e75da3e63d6 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.5 +2.3.6 diff --git a/changelogs/unreleased/41268-bump-ruby-to-2-3-6.yml b/changelogs/unreleased/41268-bump-ruby-to-2-3-6.yml new file mode 100644 index 00000000000..188a854ebee --- /dev/null +++ b/changelogs/unreleased/41268-bump-ruby-to-2-3-6.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade Ruby to 2.3.6 to include security patches +merge_request: 16016 +author: +type: security |