From 3b520f6521e5088aa00ccb47254fd3d664941eb4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 28 May 2020 12:21:49 +0000
Subject: [PATCH 1/4] Update dependency @gitlab/ui to v16

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6fde4b1c..bf52e0b0 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "main": "src/main.js",
   "dependencies": {
     "@gitlab/svgs": "1.127.0",
-    "@gitlab/ui": "15.1.0",
+    "@gitlab/ui": "16.1.0",
     "axios": "^0.19.2",
     "core-js": "^3.6.4",
     "document-register-element": "^1.14.3",
diff --git a/yarn.lock b/yarn.lock
index a73e9238..9e851707 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -830,10 +830,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.127.0.tgz#1f7ffdffe44d6a82b372535f93d78f3a895d1960"
   integrity sha512-Uv52DqkG2KwCB0VRlXUEHFZxJ/7Ql0t1YTdzICpXmDjltuUBrysFcdmWPVO6PgXQxk2ahryNsUjSOziMYTeSiw==
 
-"@gitlab/ui@15.1.0":
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-15.1.0.tgz#977a20b11105da7f92e06f18d2104ab2a0320f42"
-  integrity sha512-cn7RHqOz2C68OV32l6SA4ZCJxyVB0o31QL+1asP/GXUBlRiCE7AEfmhs0nVaeoaf8YdqrNGsGlC+22hRRmnYzA==
+"@gitlab/ui@16.1.0":
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-16.1.0.tgz#fe6bbb3a8fb8d1cb7a577f4bb7cb2f1b35b34c57"
+  integrity sha512-YPC0ntS7Wp3wQq/sSUu16Z62XgyY3Oe49vIvm0e3bt2ho2pVf9fuztrcsj7Kb9RrdHOUccUWfZLp+roDd9J0sQ==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"
-- 
GitLab


From 279a85dc5f41382af2cb9f8c35bcbdc0cba70d5b Mon Sep 17 00:00:00 2001
From: Mark Florian <markrian@gmail.com>
Date: Thu, 28 May 2020 14:26:58 +0100
Subject: [PATCH 2/4] Rename imports

---
 src/components/list_incident.vue                   | 2 +-
 src/views/details.vue                              | 2 +-
 tests/integration/components/list_incident_spec.js | 2 +-
 tests/integration/views/details_spec.js            | 2 +-
 tests/integration/views/list_spec.js               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/list_incident.vue b/src/components/list_incident.vue
index 880d2221..ab09ea5d 100644
--- a/src/components/list_incident.vue
+++ b/src/components/list_incident.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlBadge, GlTooltip } from '@gitlab/ui/';
+import { GlButton, GlDeprecatedBadge as GlBadge, GlTooltip } from '@gitlab/ui/';
 import GlMarkdown from './markdown.vue';
 import { dateTimeMixin } from '../utils/datetime';
 
diff --git a/src/views/details.vue b/src/views/details.vue
index e577662f..0950346a 100644
--- a/src/views/details.vue
+++ b/src/views/details.vue
@@ -1,7 +1,7 @@
 <script>
 import axios from 'axios';
 import * as timeago from 'timeago.js';
-import { GlTooltip, GlLoadingIcon, GlAlert, GlBadge, GlIcon } from '@gitlab/ui';
+import { GlTooltip, GlLoadingIcon, GlAlert, GlDeprecatedBadge as GlBadge, GlIcon } from '@gitlab/ui';
 import { GlMarkdown, GlComment } from '~/components';
 import { dateTimeMixin } from '~/utils/datetime';
 
diff --git a/tests/integration/components/list_incident_spec.js b/tests/integration/components/list_incident_spec.js
index d747c5cd..3e1b859e 100644
--- a/tests/integration/components/list_incident_spec.js
+++ b/tests/integration/components/list_incident_spec.js
@@ -1,5 +1,5 @@
 import { shallowMount, RouterLinkStub } from '@vue/test-utils';
-import { GlTooltip, GlBadge } from '@gitlab/ui';
+import { GlTooltip, GlDeprecatedBadge as GlBadge } from '@gitlab/ui';
 import { GlListIncident } from '~/components';
 import { dateTimeMixin } from '~/utils/datetime';
 
diff --git a/tests/integration/views/details_spec.js b/tests/integration/views/details_spec.js
index e71d4585..daaede7c 100644
--- a/tests/integration/views/details_spec.js
+++ b/tests/integration/views/details_spec.js
@@ -1,7 +1,7 @@
 import { shallowMount, RouterLinkStub } from '@vue/test-utils';
 import axios from 'axios';
 import * as timeago from 'timeago.js';
-import { GlLoadingIcon, GlAlert, GlBadge, GlTooltip } from '@gitlab/ui';
+import { GlLoadingIcon, GlAlert, GlDeprecatedBadge as GlBadge, GlTooltip } from '@gitlab/ui';
 import Details from '~/views/details.vue';
 import { GlMarkdown, GlComment } from '~/components';
 import { dateTimeMixin } from '~/utils/datetime';
diff --git a/tests/integration/views/list_spec.js b/tests/integration/views/list_spec.js
index 3b8ffdf7..e2029217 100644
--- a/tests/integration/views/list_spec.js
+++ b/tests/integration/views/list_spec.js
@@ -1,7 +1,7 @@
 /* eslint-disable promise/always-return */
 import { shallowMount, RouterLinkStub } from '@vue/test-utils';
 import axios from 'axios';
-import { GlAlert, GlLoadingIcon, GlBadge } from '@gitlab/ui';
+import { GlAlert, GlLoadingIcon, GlDeprecatedBadge as GlBadge } from '@gitlab/ui';
 import List from '~/views/list.vue';
 import { GlListIncident } from '~/components';
 
-- 
GitLab


From d8b1b71564c2a7405a1fb4459f5b99a03661c734 Mon Sep 17 00:00:00 2001
From: Mark Florian <markrian@gmail.com>
Date: Thu, 28 May 2020 14:27:05 +0100
Subject: [PATCH 3/4] Run prettier

---
 src/views/details.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/details.vue b/src/views/details.vue
index 0950346a..faed2d28 100644
--- a/src/views/details.vue
+++ b/src/views/details.vue
@@ -1,7 +1,13 @@
 <script>
 import axios from 'axios';
 import * as timeago from 'timeago.js';
-import { GlTooltip, GlLoadingIcon, GlAlert, GlDeprecatedBadge as GlBadge, GlIcon } from '@gitlab/ui';
+import {
+  GlTooltip,
+  GlLoadingIcon,
+  GlAlert,
+  GlDeprecatedBadge as GlBadge,
+  GlIcon,
+} from '@gitlab/ui';
 import { GlMarkdown, GlComment } from '~/components';
 import { dateTimeMixin } from '~/utils/datetime';
 
-- 
GitLab


From c0964eb21957d46ac14159f74ce92cd733f49a80 Mon Sep 17 00:00:00 2001
From: Mark Florian <markrian@gmail.com>
Date: Thu, 28 May 2020 17:46:26 +0100
Subject: [PATCH 4/4] Attempt to fix job failures

Specifically, bump @babel/helper-compilation-targets in order to work
around the issue described in https://github.com/babel/babel/pull/11201.
---
 yarn.lock | 70 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9e851707..524bb3c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,12 +9,12 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/compat-data@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.6.tgz#7eeaa0dfa17e50c7d9c0832515eee09b56f04e35"
-  integrity sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==
+"@babel/compat-data@^7.10.1", "@babel/compat-data@^7.8.6":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
+  integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     semver "^5.5.0"
 
@@ -73,13 +73,13 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.7"
 
-"@babel/helper-compilation-targets@^7.8.4", "@babel/helper-compilation-targets@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
-  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
+"@babel/helper-compilation-targets@^7.10", "@babel/helper-compilation-targets@^7.8.4", "@babel/helper-compilation-targets@^7.8.7":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.1.tgz#ad6f69b4c3bae955081ef914a84e5878ffcaca63"
+  integrity sha512-YuF8IrgSmX/+MV2plPkjEnzlC2wf+gaok8ehMNN0jodF3/sejZauExqpEVGbJua62oaWoNYIXwz4RmAsVcGyHw==
   dependencies:
-    "@babel/compat-data" "^7.8.6"
-    browserslist "^4.9.1"
+    "@babel/compat-data" "^7.10.1"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
@@ -2492,14 +2492,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.8.6, browserslist@^4.9.1:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c"
-  integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.8.6:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
   dependencies:
-    caniuse-lite "^1.0.30001030"
-    electron-to-chromium "^1.3.363"
-    node-releases "^1.1.50"
+    caniuse-lite "^1.0.30001043"
+    electron-to-chromium "^1.3.413"
+    node-releases "^1.1.53"
+    pkg-up "^2.0.0"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -2709,10 +2710,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030:
-  version "1.0.30001035"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
-  integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030, caniuse-lite@^1.0.30001043:
+  version "1.0.30001066"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz#0a8a58a10108f2b9bf38e7b65c237b12fd9c5f04"
+  integrity sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -4044,10 +4045,10 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.363:
-  version "1.3.376"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz#7cb7b5205564a06c8f8ecfbe832cbd47a1224bb1"
-  integrity sha512-cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw==
+electron-to-chromium@^1.3.363, electron-to-chromium@^1.3.413:
+  version "1.3.453"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.453.tgz#758a8565a64b7889b27132a51d2abb8b135c9d01"
+  integrity sha512-IQbCfjJR0NDDn/+vojTlq7fPSREcALtF8M1n01gw7nQghCtfFYrJ2dfhsp8APr8bANoFC8vRTFVXMOGpT0eetw==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -7780,12 +7781,10 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-releases@^1.1.50:
-  version "1.1.52"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"
-  integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ==
-  dependencies:
-    semver "^6.3.0"
+node-releases@^1.1.50, node-releases@^1.1.53:
+  version "1.1.57"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.57.tgz#f6754ce225fad0611e61228df3e09232e017ea19"
+  integrity sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw==
 
 nopt@~4.0.1:
   version "4.0.3"
@@ -8493,6 +8492,13 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
 please-upgrade-node@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
-- 
GitLab