summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-12-11 21:22:31 +0000
committerMike Greiling <mike@pixelcog.com>2018-12-11 21:22:31 +0000
commit6adb769e88606e4b91627abbabc9a49fd217f39e (patch)
tree098807b893aa7c0d4173ae006c2e9d7bf033b280 /.gitlab-ci.yml
parentfb00525af1dd6c7dcd2ea4ff58fa1df2dbb33659 (diff)
parent60a1f54f41dff282cea0c917787ae0834e36fce2 (diff)
downloadgitlab-ce-6adb769e88606e4b91627abbabc9a49fd217f39e.tar.gz
Merge branch 'winh-check-yarn-version' into 'master'
Check that yarn version is at least 1.10.0 See merge request gitlab-org/gitlab-ce!23612
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ae319d64d7..5d0237220db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -637,7 +637,7 @@ gitlab:setup-mysql:
# Frontend-related jobs
gitlab:assets:compile:
<<: *dedicated-no-docs-and-no-qa-pull-cache-job
- image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1
+ image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1
dependencies: []
services:
- docker:stable-dind