diff options
author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-09-27 18:50:14 +0200 |
---|---|---|
committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-09-30 13:45:15 +0200 |
commit | a8383ec4f5b9fe3c16ef6e4b6324f3d6591a4480 (patch) | |
tree | 9d84af3c1669ab44591c5ba2f869bcfb630aef98 /.gitlab-ci.yml | |
parent | b19dd19b21e37522c4a75e7d39717860aee645aa (diff) | |
download | gitlab-ce-a8383ec4f5b9fe3c16ef6e4b6324f3d6591a4480.tar.gz |
Update CI yaml and update CHANGELOG entry
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec4547804e6..177b70c0c5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3" +image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-git-2.7-phantomjs-2.1" cache: key: "ruby-231" @@ -140,7 +140,7 @@ spinach 9 10: *spinach-knapsack # Execute all testing suites against Ruby 2.1 .ruby-21: &ruby-21 - image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.1" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.1-git-2.7-phantomjs-2.1" <<: *use-db only: - master |