From f08838a95ab27aab967a3ccf52c4b73b4a1f75f8 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Thu, 6 Dec 2018 09:17:36 +0100
Subject: [PATCH 1/2] Check that yarn version is at least 1.10.0

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 7352375f78c..4fdb7f0c703 100644
--- a/package.json
+++ b/package.json
@@ -158,5 +158,8 @@
     "nodemon": "^1.18.4",
     "prettier": "1.15.2",
     "webpack-dev-server": "^3.1.10"
+  },
+  "engines": {
+    "yarn": "^1.10.0"
   }
 }

From 60a1f54f41dff282cea0c917787ae0834e36fce2 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Thu, 6 Dec 2018 08:43:18 +0000
Subject: [PATCH 2/2] Upgrade yarn to 1.12 in build image of
 gitlab:assets:compile job

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 898d740ed63..75530e2b285 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -638,7 +638,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