From d9035fa2200b3af34d257e1960f12b2831ecb278 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 3 Jan 2025 00:44:02 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/forks/components/forks_button.vue  | 2 +-
 app/assets/javascripts/stars/components/star_count.vue    | 2 +-
 .../components/deployment/deployment_view_button.vue      | 2 +-
 doc/development/database/batched_background_migrations.md | 2 +-
 package.json                                              | 2 +-
 .../runner_instructions/runner_instructions_modal_spec.js | 4 ++--
 yarn.lock                                                 | 8 ++++----
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/forks/components/forks_button.vue b/app/assets/javascripts/forks/components/forks_button.vue
index eda2518769b..54b52c29ab7 100644
--- a/app/assets/javascripts/forks/components/forks_button.vue
+++ b/app/assets/javascripts/forks/components/forks_button.vue
@@ -62,7 +62,7 @@ export default {
 </script>
 
 <template>
-  <gl-button-group :vertical="false">
+  <gl-button-group>
     <gl-button
       v-gl-tooltip
       data-testid="fork-button"
diff --git a/app/assets/javascripts/stars/components/star_count.vue b/app/assets/javascripts/stars/components/star_count.vue
index 2264e3aa777..bf032ed9c48 100644
--- a/app/assets/javascripts/stars/components/star_count.vue
+++ b/app/assets/javascripts/stars/components/star_count.vue
@@ -102,7 +102,7 @@ export default {
 </script>
 
 <template>
-  <gl-button-group :vertical="false">
+  <gl-button-group>
     <gl-button
       v-gl-tooltip
       class="star-btn"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue
index dbd81e9151d..b7eee8e68eb 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue
@@ -52,7 +52,7 @@ export default {
 </script>
 <template>
   <span class="gl-inline-flex">
-    <gl-button-group v-if="shouldRenderDropdown" size="small">
+    <gl-button-group v-if="shouldRenderDropdown">
       <review-app-link
         :display="appButtonText"
         :link="deploymentExternalUrl"
diff --git a/doc/development/database/batched_background_migrations.md b/doc/development/database/batched_background_migrations.md
index 2a9db5ea423..d8dc2518009 100644
--- a/doc/development/database/batched_background_migrations.md
+++ b/doc/development/database/batched_background_migrations.md
@@ -307,7 +307,7 @@ See the below [Examples](#examples) for specific details on what the actual
 migration code should be.
 
 NOTE:
-If the migration is being finalized before one required stop since it was enqueued, and early finalization
+If the migration is being finalized before one required stop since it was enqueued, an early finalization
 error will be raised. If the migration requires to be finalized before one required stop,
 use `skip_early_finalization_validation: true` option to skip this check.
 
diff --git a/package.json b/package.json
index a0e90b4d407..484873a1366 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@gitlab/fonts": "^1.3.0",
     "@gitlab/query-language-rust": "0.2.0",
     "@gitlab/svgs": "3.121.0",
-    "@gitlab/ui": "105.7.0",
+    "@gitlab/ui": "106.0.0",
     "@gitlab/vue-router-vue3": "npm:vue-router@4.1.6",
     "@gitlab/vuex-vue3": "npm:vuex@4.0.0",
     "@gitlab/web-ide": "^0.0.1-dev-20241112063543",
diff --git a/spec/frontend/ci/runner/components/registration/runner_instructions/runner_instructions_modal_spec.js b/spec/frontend/ci/runner/components/registration/runner_instructions/runner_instructions_modal_spec.js
index 64a28f044d2..040ea70cd5e 100644
--- a/spec/frontend/ci/runner/components/registration/runner_instructions/runner_instructions_modal_spec.js
+++ b/spec/frontend/ci/runner/components/registration/runner_instructions/runner_instructions_modal_spec.js
@@ -113,14 +113,14 @@ describe('RunnerInstructionsModal component', () => {
         MockResizeObserver.mockResize('xs');
         await nextTick();
 
-        expect(findPlatformButtonGroup().attributes('vertical')).toEqual('true');
+        expect(findPlatformButtonGroup().props('vertical')).toBe(true);
       });
 
       it('to a non-xs viewport', async () => {
         MockResizeObserver.mockResize('sm');
         await nextTick();
 
-        expect(findPlatformButtonGroup().props('vertical')).toBeUndefined();
+        expect(findPlatformButtonGroup().props('vertical')).toBe(false);
       });
     });
 
diff --git a/yarn.lock b/yarn.lock
index 393f34e3aa1..51617dc7570 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1432,10 +1432,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.121.0.tgz#57cacc895929aef4320632396373797a64b230ff"
   integrity sha512-ZekVjdMZrjrNEjdrOHsJYCu7A+ea3AkuNUxWIZ3FaNgJj4Oh21RlTP7bQKnRSXVhBbV1jg1PgzQ1ANEoCW8t4g==
 
-"@gitlab/ui@105.7.0":
-  version "105.7.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-105.7.0.tgz#30a2e78b14ab586bff13d7779991e6650bbff735"
-  integrity sha512-UWtO3mLpJOmxtp7QN4oPdX9SEFtIclMsEFZlYr2tfDRxULmY9JbGhBXO9fCmELExwM6+hUXGV1gvDz1NtOLnjA==
+"@gitlab/ui@106.0.0":
+  version "106.0.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-106.0.0.tgz#602f2bbbac99958331e4baa9349d4139d5682b48"
+  integrity sha512-TRxwguN2kwTuaOUUZnHAzcI7vZr3o3b9WEOpPzUNhh4K770ytwNYJezt+MrqXe/AX+y1dsFC5CcDyCiXujwsGg==
   dependencies:
     "@floating-ui/dom" "1.4.3"
     echarts "^5.3.2"