Skip to content

Commit 6bbf79d

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 20eb715 commit 6bbf79d

File tree

129 files changed

+1345
-695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1345
-695
lines changed

‎.gitlab/ci/docs.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ review-docs-cleanup:
3535

3636
.docs-markdown-lint-image:
3737
# When updating the image version here, update it in /scripts/lint-doc.sh too.
38-
image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/technical-writing/docs-gitlab-com/lint-markdown:alpine-3.21-vale-3.9.3-markdownlint2-0.17.1-lychee-0.18.0
38+
image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/technical-writing/docs-gitlab-com/lint-markdown:alpine-3.21-vale-3.11.2-markdownlint2-0.17.2-lychee-0.18.1
3939

4040
docs-lint markdown:
4141
extends:

‎.vale.ini

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
StylesPath = doc/.vale
66
MinAlertLevel = suggestion
77

8+
IgnoredScopes = code, text.frontmatter.redirect_to
9+
810
[*.md]
911
BasedOnStyles = gitlab_base, gitlab_docs
1012

‎Gemfile.checksum

+2-2
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@
631631
{"name":"rubocop-rspec","version":"3.0.5","platform":"ruby","checksum":"c6a8e29fb1b00d227c32df159e92f5ebb9e0ff734e52955fb13aff5c74977e0f"},
632632
{"name":"rubocop-rspec_rails","version":"2.30.0","platform":"ruby","checksum":"888112e83f9d7ef7ad2397e9d69a0b9614a4bae24f072c399804a180f80c4c46"},
633633
{"name":"ruby-fogbugz","version":"0.3.0","platform":"ruby","checksum":"5e04cde474648f498a71cf1e1a7ab42c66b953862fbe224f793ec0a7a1d5f657"},
634-
{"name":"ruby-lsp","version":"0.23.10","platform":"ruby","checksum":"71dfb08ff3bdc66f92c18e49f7ce3fe772b25804bcd08a4369f70bcad1534d6c"},
634+
{"name":"ruby-lsp","version":"0.23.13","platform":"ruby","checksum":"a1875a9905a79a41c63d8df52bd016f238d635b64c8f0aac3639336bcf659f48"},
635635
{"name":"ruby-lsp-rails","version":"0.3.31","platform":"ruby","checksum":"670aed466e54b5632e4907b8dedb91d8b144917c42513e013d656af175bf8c76"},
636636
{"name":"ruby-lsp-rspec","version":"0.1.22","platform":"ruby","checksum":"e982edf5cd6ec1530c3f5fa7e423624ad00532ebeff7fc94e02c7516a9b759c0"},
637637
{"name":"ruby-magic","version":"0.6.0","platform":"ruby","checksum":"7b2138877b7d23aff812c95564eba6473b74b815ef85beb0eb792e729a2b6101"},
@@ -754,7 +754,7 @@
754754
{"name":"typhoeus","version":"1.4.1","platform":"ruby","checksum":"1c17db8364bd45ab302dc61e460173c3e69835896be88a3df07c206d5c55ef7c"},
755755
{"name":"tzinfo","version":"2.0.6","platform":"ruby","checksum":"8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b"},
756756
{"name":"uber","version":"0.1.0","platform":"ruby","checksum":"5beeb407ff807b5db994f82fa9ee07cfceaa561dad8af20be880bc67eba935dc"},
757-
{"name":"undercover","version":"0.6.3","platform":"ruby","checksum":"a74c4246bc3ed0a506681f9cc41e2cf353c12f1544bb2b7798807e81f2cb65fa"},
757+
{"name":"undercover","version":"0.6.4","platform":"ruby","checksum":"3c34fcf129b52a4993065c52612a65e5e05e77f0cac3f4f8f388114fb129ec1a"},
758758
{"name":"unf","version":"0.1.4","platform":"java","checksum":"49a5972ec0b3d091d3b0b2e00113f2f342b9b212f0db855eb30a629637f6d302"},
759759
{"name":"unf","version":"0.1.4","platform":"ruby","checksum":"4999517a531f2a955750f8831941891f6158498ec9b6cb1c81ce89388e63022e"},
760760
{"name":"unf_ext","version":"0.0.8.2","platform":"ruby","checksum":"90b9623ee359cc4878461c5d2eab7d3d3ce5801a680a9e7ac83b8040c5b742fa"},

‎Gemfile.lock

+4-3
Original file line numberDiff line numberDiff line change
@@ -1698,7 +1698,7 @@ GEM
16981698
ruby-fogbugz (0.3.0)
16991699
crack (~> 0.4)
17001700
multipart-post (~> 2.0)
1701-
ruby-lsp (0.23.10)
1701+
ruby-lsp (0.23.13)
17021702
language_server-protocol (~> 3.17.0)
17031703
prism (>= 1.2, < 2.0)
17041704
rbs (>= 3, < 4)
@@ -1910,11 +1910,12 @@ GEM
19101910
tzinfo (2.0.6)
19111911
concurrent-ruby (~> 1.0)
19121912
uber (0.1.0)
1913-
undercover (0.6.3)
1913+
undercover (0.6.4)
1914+
base64
19141915
bigdecimal
19151916
imagen (>= 0.2.0)
19161917
rainbow (>= 2.1, < 4.0)
1917-
rugged (>= 0.27, < 1.8)
1918+
rugged (>= 0.27, < 1.10)
19181919
unf (0.1.4)
19191920
unf_ext
19201921
unf_ext (0.0.8.2)

‎Gemfile.next.checksum

+2-2
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@
641641
{"name":"rubocop-rspec","version":"3.0.5","platform":"ruby","checksum":"c6a8e29fb1b00d227c32df159e92f5ebb9e0ff734e52955fb13aff5c74977e0f"},
642642
{"name":"rubocop-rspec_rails","version":"2.30.0","platform":"ruby","checksum":"888112e83f9d7ef7ad2397e9d69a0b9614a4bae24f072c399804a180f80c4c46"},
643643
{"name":"ruby-fogbugz","version":"0.3.0","platform":"ruby","checksum":"5e04cde474648f498a71cf1e1a7ab42c66b953862fbe224f793ec0a7a1d5f657"},
644-
{"name":"ruby-lsp","version":"0.23.10","platform":"ruby","checksum":"71dfb08ff3bdc66f92c18e49f7ce3fe772b25804bcd08a4369f70bcad1534d6c"},
644+
{"name":"ruby-lsp","version":"0.23.13","platform":"ruby","checksum":"a1875a9905a79a41c63d8df52bd016f238d635b64c8f0aac3639336bcf659f48"},
645645
{"name":"ruby-lsp-rails","version":"0.3.31","platform":"ruby","checksum":"670aed466e54b5632e4907b8dedb91d8b144917c42513e013d656af175bf8c76"},
646646
{"name":"ruby-lsp-rspec","version":"0.1.22","platform":"ruby","checksum":"e982edf5cd6ec1530c3f5fa7e423624ad00532ebeff7fc94e02c7516a9b759c0"},
647647
{"name":"ruby-magic","version":"0.6.0","platform":"ruby","checksum":"7b2138877b7d23aff812c95564eba6473b74b815ef85beb0eb792e729a2b6101"},
@@ -767,7 +767,7 @@
767767
{"name":"typhoeus","version":"1.4.1","platform":"ruby","checksum":"1c17db8364bd45ab302dc61e460173c3e69835896be88a3df07c206d5c55ef7c"},
768768
{"name":"tzinfo","version":"2.0.6","platform":"ruby","checksum":"8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b"},
769769
{"name":"uber","version":"0.1.0","platform":"ruby","checksum":"5beeb407ff807b5db994f82fa9ee07cfceaa561dad8af20be880bc67eba935dc"},
770-
{"name":"undercover","version":"0.6.3","platform":"ruby","checksum":"a74c4246bc3ed0a506681f9cc41e2cf353c12f1544bb2b7798807e81f2cb65fa"},
770+
{"name":"undercover","version":"0.6.4","platform":"ruby","checksum":"3c34fcf129b52a4993065c52612a65e5e05e77f0cac3f4f8f388114fb129ec1a"},
771771
{"name":"unf","version":"0.1.4","platform":"java","checksum":"49a5972ec0b3d091d3b0b2e00113f2f342b9b212f0db855eb30a629637f6d302"},
772772
{"name":"unf","version":"0.1.4","platform":"ruby","checksum":"4999517a531f2a955750f8831941891f6158498ec9b6cb1c81ce89388e63022e"},
773773
{"name":"unf_ext","version":"0.0.8.2","platform":"ruby","checksum":"90b9623ee359cc4878461c5d2eab7d3d3ce5801a680a9e7ac83b8040c5b742fa"},

‎Gemfile.next.lock

+4-3
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,7 @@ GEM
17301730
ruby-fogbugz (0.3.0)
17311731
crack (~> 0.4)
17321732
multipart-post (~> 2.0)
1733-
ruby-lsp (0.23.10)
1733+
ruby-lsp (0.23.13)
17341734
language_server-protocol (~> 3.17.0)
17351735
prism (>= 1.2, < 2.0)
17361736
rbs (>= 3, < 4)
@@ -1944,11 +1944,12 @@ GEM
19441944
tzinfo (2.0.6)
19451945
concurrent-ruby (~> 1.0)
19461946
uber (0.1.0)
1947-
undercover (0.6.3)
1947+
undercover (0.6.4)
1948+
base64
19481949
bigdecimal
19491950
imagen (>= 0.2.0)
19501951
rainbow (>= 2.1, < 4.0)
1951-
rugged (>= 0.27, < 1.8)
1952+
rugged (>= 0.27, < 1.10)
19521953
unf (0.1.4)
19531954
unf_ext
19541955
unf_ext (0.0.8.2)

‎app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue

+15-22
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
import { __, s__, sprintf } from '~/locale';
1515
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
1616
import CrudComponent from '~/vue_shared/components/crud_component.vue';
17+
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
1718
import { convertEnvironmentScope } from '~/ci/common/private/ci_environments_dropdown';
1819
import {
1920
DEFAULT_EXCEEDS_VARIABLE_LIMIT_TEXT,
@@ -69,6 +70,7 @@ export default {
6970
GlTable,
7071
GlModal,
7172
CrudComponent,
73+
ClipboardButton,
7274
},
7375
directives: {
7476
GlModalDirective,
@@ -273,15 +275,12 @@ export default {
273275
class="gl-inline-block gl-max-w-full gl-break-anywhere"
274276
>{{ item.key }}</span
275277
>
276-
<gl-button
277-
v-gl-tooltip
278+
<clipboard-button
279+
:text="item.key"
280+
:title="__('Copy key')"
278281
category="tertiary"
279-
icon="copy-to-clipboard"
280-
class="-gl-my-2 gl-ml-2"
281282
size="small"
282-
:title="__('Copy key')"
283-
:data-clipboard-text="item.key"
284-
:aria-label="__('Copy to clipboard')"
283+
class="-gl-my-2 gl-ml-2"
285284
/>
286285
</div>
287286
<div v-if="item.description" class="gl-mt-2 gl-text-sm gl-text-subtle">
@@ -304,23 +303,20 @@ export default {
304303
v-if="!item.hidden"
305304
class="-gl-mr-3 gl-flex gl-items-start gl-justify-end md:gl-justify-start"
306305
>
307-
<span v-if="areValuesHidden" data-testid="hiddenValue">*****</span>
306+
<span v-if="areValuesHidden" data-testid="hiddenValue">•••••</span>
308307
<span
309308
v-else
310309
:id="`ci-variable-value-${item.id}`"
311310
class="gl-inline-block gl-max-w-full gl-truncate"
312311
data-testid="revealedValue"
313312
>{{ item.value }}</span
314313
>
315-
<gl-button
316-
v-gl-tooltip
314+
<clipboard-button
315+
:text="item.value"
316+
:title="__('Copy value')"
317317
category="tertiary"
318-
icon="copy-to-clipboard"
319-
class="-gl-my-2 gl-ml-2"
320318
size="small"
321-
:title="__('Copy value')"
322-
:data-clipboard-text="item.value"
323-
:aria-label="__('Copy to clipboard')"
319+
class="-gl-my-2 gl-ml-2"
324320
/>
325321
</div>
326322
</template>
@@ -331,15 +327,12 @@ export default {
331327
class="gl-inline-block gl-max-w-full gl-break-anywhere"
332328
>{{ convertEnvironmentScopeValue(item.environmentScope) }}</span
333329
>
334-
<gl-button
335-
v-gl-tooltip
330+
<clipboard-button
331+
:text="convertEnvironmentScopeValue(item.environmentScope)"
332+
:title="__('Copy environment')"
336333
category="tertiary"
337-
icon="copy-to-clipboard"
338-
class="-gl-my-2 gl-ml-2"
339334
size="small"
340-
:title="__('Copy environment')"
341-
:data-clipboard-text="convertEnvironmentScopeValue(item.environmentScope)"
342-
:aria-label="__('Copy to clipboard')"
335+
class="-gl-my-2 gl-ml-2"
343336
/>
344337
</div>
345338
</template>

‎app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue

+16-12
Original file line numberDiff line numberDiff line change
@@ -309,18 +309,22 @@ export default {
309309
>
310310
</div>
311311
</div>
312-
<gl-button
313-
v-if="showAction"
314-
v-gl-tooltip
315-
:title="action.ariaLabel"
316-
:loading="isActionLoading"
317-
:icon="action.icon"
318-
class="gl-h-7 gl-w-7 !gl-rounded-full"
319-
:aria-label="action.ariaLabel"
320-
@click="action.method"
321-
@mouseover="setActionTooltip(true)"
322-
@mouseout="setActionTooltip(false)"
323-
/>
312+
<div>
313+
<gl-button
314+
v-if="showAction"
315+
v-gl-tooltip
316+
:title="action.ariaLabel"
317+
:loading="isActionLoading"
318+
size="small"
319+
class="!gl-rounded-full !gl-p-0"
320+
:aria-label="action.ariaLabel"
321+
@click="action.method"
322+
@mouseover="setActionTooltip(true)"
323+
@mouseout="setActionTooltip(false)"
324+
>
325+
<gl-icon :name="action.icon" size="12" />
326+
</gl-button>
327+
</div>
324328
</div>
325329
<span
326330
v-if="hasSourceJob"

‎app/assets/javascripts/ci/runner/components/registration/registration_instructions.vue

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import RunnerGoogleCloudOption from '~/ci/runner/components/runner_google_cloud_
1010
1111
import runnerForRegistrationQuery from '../../graphql/register/runner_for_registration.query.graphql';
1212
import {
13-
STATUS_ONLINE,
13+
CREATION_STATE_FINISHED,
1414
EXECUTORS_HELP_URL,
1515
SERVICE_COMMANDS_HELP_URL,
1616
RUNNER_REGISTRATION_POLLING_INTERVAL_MS,
@@ -92,7 +92,7 @@ export default {
9292
captureException({ error, component: this.$options.name });
9393
},
9494
pollInterval() {
95-
if (this.isRunnerOnline) {
95+
if (this.isRunnerRegistered) {
9696
// stop polling
9797
return 0;
9898
}
@@ -141,8 +141,8 @@ export default {
141141
runCommand() {
142142
return runCommand({ platform: this.platform });
143143
},
144-
isRunnerOnline() {
145-
return this.runner?.status === STATUS_ONLINE;
144+
isRunnerRegistered() {
145+
return this.runner?.creationState === CREATION_STATE_FINISHED;
146146
},
147147
showGoogleCloudRegistration() {
148148
return this.platform === GOOGLE_CLOUD_PLATFORM;
@@ -152,7 +152,7 @@ export default {
152152
},
153153
},
154154
watch: {
155-
isRunnerOnline(newVal, oldVal) {
155+
isRunnerRegistered(newVal, oldVal) {
156156
if (!oldVal && newVal) {
157157
this.$emit('runnerRegistered');
158158
}
@@ -172,7 +172,7 @@ export default {
172172
this.isDrawerOpen = val;
173173
},
174174
onBeforeunload(event) {
175-
if (this.isRunnerOnline) {
175+
if (this.isRunnerRegistered) {
176176
return undefined;
177177
}
178178
@@ -310,7 +310,7 @@ export default {
310310
<platforms-drawer :platform="platform" :open="isDrawerOpen" @close="onToggleDrawer(false)" />
311311
</template>
312312
313-
<section v-if="isRunnerOnline" class="gl-mt-6">
313+
<section v-if="isRunnerRegistered" class="gl-mt-6">
314314
<h2 class="gl-heading-2">🎉 {{ s__("Runners|You've registered a new runner!") }}</h2>
315315
316316
<p>

‎app/assets/javascripts/ci/runner/constants.js

+5
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ export const GROUP_TYPE = 'GROUP_TYPE';
150150
export const PROJECT_TYPE = 'PROJECT_TYPE';
151151
export const RUNNER_TYPES = [INSTANCE_TYPE, GROUP_TYPE, PROJECT_TYPE];
152152

153+
// CiRunnerCreationState
154+
155+
export const CREATION_STATE_STARTED = 'STARTED';
156+
export const CREATION_STATE_FINISHED = 'FINISHED';
157+
153158
// CiRunnerStatus
154159

155160
export const STATUS_ONLINE = 'ONLINE';

‎app/assets/javascripts/ci/runner/graphql/register/runner_for_registration.query.graphql

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ query getRunnerForRegistration($id: CiRunnerID!) {
33
id
44
description
55
ephemeralAuthenticationToken
6-
status
6+
creationState
77
}
88
}

‎app/assets/javascripts/diffs/components/app.vue

+1
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,7 @@ export default {
787787
<diffs-file-tree
788788
v-if="renderFileTree"
789789
class="gl-px-5"
790+
:total-files-count="numTotalFiles"
790791
@clickFile="goToFile({ path: $event.path })"
791792
/>
792793
<div class="col-12 col-md-auto diff-files-holder">

‎app/assets/javascripts/diffs/components/diffs_file_tree.vue

+6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ export default {
2929
required: false,
3030
default: false,
3131
},
32+
totalFilesCount: {
33+
type: [Number, String],
34+
default: undefined,
35+
required: false,
36+
},
3237
},
3338
data() {
3439
const treeWidth =
@@ -133,6 +138,7 @@ export default {
133138
<tree-list
134139
:hide-file-stats="hideFileStats"
135140
:loaded-files="loadedFiles"
141+
:total-files-count="totalFilesCount"
136142
@clickFile="onFileClick"
137143
/>
138144
</div>

‎app/assets/javascripts/diffs/components/tree_list.vue

+8-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ export default {
4141
required: false,
4242
default: null,
4343
},
44+
totalFilesCount: {
45+
type: [Number, String],
46+
default: undefined,
47+
required: false,
48+
},
4449
},
4550
data() {
4651
return {
@@ -52,7 +57,6 @@ export default {
5257
'renderTreeList',
5358
'currentDiffFileId',
5459
'viewedDiffFileIds',
55-
'realSize',
5660
'fileTree',
5761
'allBlobs',
5862
'linkedFile',
@@ -191,7 +195,9 @@ export default {
191195
<div class="tree-list-holder flex-column gl-flex" data-testid="file-tree-container">
192196
<div class="gl-mb-3 gl-flex gl-items-center">
193197
<h5 class="gl-my-0 gl-inline-block">{{ __('Files') }}</h5>
194-
<gl-badge class="gl-ml-2" data-testid="file-count">{{ realSize }}</gl-badge>
198+
<gl-badge v-if="totalFilesCount != null" class="gl-ml-2" data-testid="file-count">{{
199+
totalFilesCount
200+
}}</gl-badge>
195201
<gl-button-group class="gl-ml-auto">
196202
<gl-button
197203
v-gl-tooltip.hover

‎app/assets/javascripts/import/manifest/import_manifest_file_app.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ export default {
115115
>
116116
<template #form>
117117
<group-select
118-
class="gl-w-full"
119118
:label="__('Group')"
120119
:initial-selection="namespaceId"
121120
:description="__('Choose the top-level group for your repository imports.')"
122121
input-name="group"
123122
input-id="group"
124123
block
124+
fluid-width
125125
@input="handleGroupSelected"
126126
@clear="handleGroupSelected"
127127
/>

‎app/assets/javascripts/rapid_diffs/app/file_browser.vue

+3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ import { mapState } from 'pinia';
33
import DiffsFileTree from '~/diffs/components/diffs_file_tree.vue';
44
import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
55
import { useFileBrowser } from '~/diffs/stores/file_browser';
6+
import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
67
78
export default {
89
name: 'FileBrowser',
910
components: {
1011
DiffsFileTree,
1112
},
1213
computed: {
14+
...mapState(useDiffsView, ['totalFilesCount']),
1315
...mapState(useDiffsList, ['loadedFiles']),
1416
...mapState(useFileBrowser, ['fileBrowserVisible']),
1517
},
@@ -26,6 +28,7 @@ export default {
2628
v-if="fileBrowserVisible"
2729
floating-resize
2830
:loaded-files="loadedFiles"
31+
:total-files-count="totalFilesCount"
2932
@clickFile="clickFile"
3033
/>
3134
</template>

0 commit comments

Comments
 (0)