root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2025-01-03 00:44:02 +00:00
parent 0e29965153
commit d9035fa220
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/forks/components/forks_button.vue
View File

@ -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"

2
app/assets/javascripts/stars/components/star_count.vue
View File

@ -102,7 +102,7 @@ export default {
</script>
<template>
<gl-button-group :vertical="false">
<gl-button-group>
<gl-button
v-gl-tooltip
class="star-btn"

2
app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue
View File

@ -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"

2
doc/development/database/batched_background_migrations.md
View File

@ -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.

2
package.json
View File

@ -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",

4
spec/frontend/ci/runner/components/registration/runner_instructions/runner_instructions_modal_spec.js
View File

@ -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);
});
});

8
yarn.lock
View File

@ -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"