From 39c43623d9827f1e20eadeac717c67ba39e26c14 Mon Sep 17 00:00:00 2001
From: Mark Florian <mflorian@gitlab.com>
Date: Thu, 6 Mar 2025 12:03:50 +0000
Subject: [PATCH 1/3] fix(Vue3): Remove slot check workaround

With our upgrade to @vue/compat@3.5.13 in
https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/4900, which
includes the fix for https://github.com/vuejs/core/issues/8869
(https://github.com/vuejs/core/pull/10868) we no longer need this
workaround.
---
 src/utils/is_slot_empty.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/utils/is_slot_empty.js b/src/utils/is_slot_empty.js
index fee8896853..abe7eb26c4 100644
--- a/src/utils/is_slot_empty.js
+++ b/src/utils/is_slot_empty.js
@@ -3,10 +3,6 @@ import Vue from 'vue';
 // Fragment will be available only in Vue.js 3
 const { Fragment, Comment, Text } = Vue;
 
-function callIfNeeded(fnOrResult, args) {
-  return fnOrResult instanceof Function ? fnOrResult(args) : fnOrResult;
-}
-
 export function isVnodeEmpty(vnode) {
   if (!vnode || (Comment && vnode.type === Comment)) {
     return true;
@@ -32,13 +28,7 @@ export function isVnodeEmpty(vnode) {
 }
 
 export function isSlotEmpty(vueInstance, slot, slotArgs) {
-  const isVue3 = Boolean(Fragment);
-
-  const slotContent = isVue3
-    ? // we need to check both $slots and $scopedSlots due to https://github.com/vuejs/core/issues/8869
-      // additionally, in @vue/compat $slot might be a function instead of array of vnodes (sigh)
-      callIfNeeded(vueInstance.$slots[slot] || vueInstance.$scopedSlots[slot], slotArgs)
-    : vueInstance.$scopedSlots[slot]?.(slotArgs);
+  const slotContent = vueInstance.$scopedSlots[slot]?.(slotArgs);
 
   // eslint-disable-next-line unicorn/no-array-callback-reference
   return isVnodeEmpty(slotContent);
-- 
GitLab


From 001909638fda61b304ac6f58ef5a914499687f8d Mon Sep 17 00:00:00 2001
From: Mark Florian <mflorian@gitlab.com>
Date: Thu, 6 Mar 2025 12:03:50 +0000
Subject: [PATCH 2/3] chore: introduce merge conflict to avoid merged pipeline

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f44fd1954d..396fa7f9d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# [106.0.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v105.7.0...v106.0.0) (2024-12-20)
+# [merge conflict 106.0.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v105.7.0...v106.0.0) (2024-12-20)
 
 
 ### Features
-- 
GitLab


From 8c86211e25201b6339342c2c2d63958da9c32dfa Mon Sep 17 00:00:00 2001
From: Paul Gascou-Vaillancourt <paul.gascvail@gmail.com>
Date: Mon, 20 Jan 2025 09:59:55 -0500
Subject: [PATCH 3/3] ci: remove `nodejs-scan-sast` job

`nodejs-scan-sast` has been removed from the SAST template and needs to
be removed for pipeline to run properly.
---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d91e31dcc3..b73c32eda6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,9 +44,6 @@ semgrep-sast:
 gitlab-advanced-sast:
   needs: []
 
-nodejs-scan-sast:
-  needs: []
-
 secret_detection:
   needs: []
 
-- 
GitLab