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 | |
| parent | b19dd19b21e37522c4a75e7d39717860aee645aa (diff) | |
| download | gitlab-ce-a8383ec4f5b9fe3c16ef6e4b6324f3d6591a4480.tar.gz | |
Update CI yaml and update CHANGELOG entry
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | CHANGELOG | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/CHANGELOG b/CHANGELOG index 08018e6169c..9df7f9746b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 8.13.0 (unreleased) - Use a ConnectionPool for Rails.cache on Sidekiq servers - Only update issuable labels if they have been changed - Take filters in account in issuable counters. !6496 + - Use custom Ruby images to test builds (registry.gitlab.com/gitlab-org/gitlab-build-images:*) - Revoke button in Applications Settings underlines on hover. - Fix Long commit messages overflow viewport in file tree - Revert avoid touching file system on Build#artifacts? @@ -140,7 +141,6 @@ v 8.12.0 - Fix issue with slash commands not loading on new issue page - Fix inconsistent background color for filter input field (ClemMakesApps) - Remove prefixes from transition CSS property (ClemMakesApps) - - Use custom Ruby images to test builds (registry.gitlab.com/gitlab-org/gitlab-build-images:*) - Add Sentry logging to API calls - Add BroadcastMessage API - Use 'git update-ref' for safer web commits !6130 |