Skip to content

Commit 0d537d4

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 0517c85 commit 0d537d4

File tree

101 files changed

+904
-458
lines changed

Some content is hidden

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

101 files changed

+904
-458
lines changed

.eslint_todo/vue-no-unused-properties.mjs

-1
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,6 @@ export default {
532532
'ee/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue',
533533
'ee/app/assets/javascripts/work_items/components/work_item_custom_fields_multi_select.vue',
534534
'ee/app/assets/javascripts/work_items/components/work_item_custom_fields_single_select.vue',
535-
'ee/app/assets/javascripts/work_items/components/work_item_custom_fields_text.vue',
536535
'ee/app/assets/javascripts/work_items/components/work_item_development/work_item_development_ff_item.vue',
537536
'ee/app/assets/javascripts/work_items/components/work_item_health_status.vue',
538537
'ee/app/assets/javascripts/work_items/components/work_item_iteration.vue',

.gitlab/ci/build-images.gitlab-ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ build-assets-image:
6363
needs: ["compile-production-assets"]
6464
variables:
6565
GLCI_BUILD_ASSETS_IMAGE: "true"
66+
ARCH: linux/amd64,linux/arm64
6667
script:
6768
- scripts/build_assets_image
6869
artifacts:

.gitlab/ci/frontend.gitlab-ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ compile-production-assets:
4040
- $GITLAB_LARGE_RUNNER_OPTIONAL
4141
variables:
4242
GLCI_BUILD_ASSETS_IMAGE: "true"
43+
ARCH: linux/amd64,linux/arm64
4344
before_script:
4445
- !reference [.compile-assets-base, before_script]
4546
- !reference [.buildx-setup, before_script]

GITLAB_KAS_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
41d3ac6cbd846b800e4a7fe3418481f158c22833
1+
59a2ee5afdfb999a59d701a272bce212e9a49db1

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -756,4 +756,4 @@ gem 'paper_trail', '~> 15.0', feature_category: :shared
756756

757757
gem "i18n_data", "~> 0.13.1", feature_category: :system_access
758758

759-
gem "gitlab-cloud-connector", "~> 1.4", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
759+
gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector

Gemfile.checksum

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
{"name":"gitaly","version":"17.8.4","platform":"ruby","checksum":"196d9735a83f8a7d396baa216b979eb0c801622d8b7573f90010338d5b0c7b4f"},
221221
{"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
222222
{"name":"gitlab-chronic","version":"0.10.6","platform":"ruby","checksum":"a244d11a1396d2aac6ae9b2f326adf1605ec1ad20c29f06e8b672047d415a9ac"},
223-
{"name":"gitlab-cloud-connector","version":"1.4.0","platform":"ruby","checksum":"01083b3a03f6db3d2da116cc7e8f3a121eaa91240a738a503b80199e6d8ccd90"},
223+
{"name":"gitlab-cloud-connector","version":"1.5.0","platform":"ruby","checksum":"eefb45ddd39906d738e30ad70ce1b329b527aaa00de1737e64205e83ad2beefd"},
224224
{"name":"gitlab-dangerfiles","version":"4.8.1","platform":"ruby","checksum":"bbad321c9638152a643d27a20b35ba1e2d8eddcc6bdfc4493d7b96e816ecf300"},
225225
{"name":"gitlab-experiment","version":"0.9.1","platform":"ruby","checksum":"f230ee742154805a755d5f2539dc44d93cdff08c5bbbb7656018d61f93d01f48"},
226226
{"name":"gitlab-fog-azure-rm","version":"2.2.0","platform":"ruby","checksum":"31aa7c2170f57874053144e7f716ec9e15f32e71ffbd2c56753dce46e2e78ba9"},

Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ GEM
742742
terminal-table (>= 1.5.1)
743743
gitlab-chronic (0.10.6)
744744
numerizer (~> 0.2)
745-
gitlab-cloud-connector (1.4.0)
745+
gitlab-cloud-connector (1.5.0)
746746
activesupport (~> 7.0)
747747
jwt (~> 2.9.3)
748748
gitlab-dangerfiles (4.8.1)
@@ -2102,7 +2102,7 @@ DEPENDENCIES
21022102
gitlab-active-context!
21032103
gitlab-backup-cli!
21042104
gitlab-chronic (~> 0.10.5)
2105-
gitlab-cloud-connector (~> 1.4)
2105+
gitlab-cloud-connector (~> 1.5)
21062106
gitlab-dangerfiles (~> 4.8.0)
21072107
gitlab-duo-workflow-service-client (~> 0.1)!
21082108
gitlab-experiment (~> 0.9.1)

Gemfile.next.checksum

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
{"name":"gitaly","version":"17.8.4","platform":"ruby","checksum":"196d9735a83f8a7d396baa216b979eb0c801622d8b7573f90010338d5b0c7b4f"},
221221
{"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
222222
{"name":"gitlab-chronic","version":"0.10.6","platform":"ruby","checksum":"a244d11a1396d2aac6ae9b2f326adf1605ec1ad20c29f06e8b672047d415a9ac"},
223-
{"name":"gitlab-cloud-connector","version":"1.4.0","platform":"ruby","checksum":"01083b3a03f6db3d2da116cc7e8f3a121eaa91240a738a503b80199e6d8ccd90"},
223+
{"name":"gitlab-cloud-connector","version":"1.5.0","platform":"ruby","checksum":"eefb45ddd39906d738e30ad70ce1b329b527aaa00de1737e64205e83ad2beefd"},
224224
{"name":"gitlab-dangerfiles","version":"4.8.1","platform":"ruby","checksum":"bbad321c9638152a643d27a20b35ba1e2d8eddcc6bdfc4493d7b96e816ecf300"},
225225
{"name":"gitlab-experiment","version":"0.9.1","platform":"ruby","checksum":"f230ee742154805a755d5f2539dc44d93cdff08c5bbbb7656018d61f93d01f48"},
226226
{"name":"gitlab-fog-azure-rm","version":"2.2.0","platform":"ruby","checksum":"31aa7c2170f57874053144e7f716ec9e15f32e71ffbd2c56753dce46e2e78ba9"},

Gemfile.next.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ GEM
754754
terminal-table (>= 1.5.1)
755755
gitlab-chronic (0.10.6)
756756
numerizer (~> 0.2)
757-
gitlab-cloud-connector (1.4.0)
757+
gitlab-cloud-connector (1.5.0)
758758
activesupport (~> 7.0)
759759
jwt (~> 2.9.3)
760760
gitlab-dangerfiles (4.8.1)
@@ -2136,7 +2136,7 @@ DEPENDENCIES
21362136
gitlab-active-context!
21372137
gitlab-backup-cli!
21382138
gitlab-chronic (~> 0.10.5)
2139-
gitlab-cloud-connector (~> 1.4)
2139+
gitlab-cloud-connector (~> 1.5)
21402140
gitlab-dangerfiles (~> 4.8.0)
21412141
gitlab-duo-workflow-service-client (~> 0.1)!
21422142
gitlab-experiment (~> 0.9.1)

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ files in this repository.
3636

3737
## Hiring
3838

39-
We are hiring developers, support people, and production engineers all the time, please see our [jobs page](https://about.gitlab.com/jobs/).
39+
We are hiring developers, support engineers, and production engineers all the time, please see our [jobs page](https://about.gitlab.com/jobs/).
4040

4141
## Website
4242

app/assets/javascripts/analytics/devops_reports/components/devops_score.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { sprintf, s__ } from '~/locale';
66
import DevopsScoreCallout from './devops_score_callout.vue';
77
88
const defaultHeaderAttrs = {
9-
thClass: '!gl-bg-white',
9+
thClass: '!gl-bg-default',
1010
// eslint-disable-next-line max-params
1111
thAttr: (value, key, item, type) => (type === 'head' ? { 'data-testid': 'header' } : {}),
1212
};

app/assets/javascripts/behaviors/shortcuts/shortcuts_help.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default {
6262
:hide-footer="true"
6363
@hidden="$emit('hidden')"
6464
>
65-
<div class="gl-sticky gl-top-0 gl-flex gl-items-center gl-bg-white gl-px-5 gl-py-5">
65+
<div class="gl-sticky gl-top-0 gl-flex gl-items-center gl-bg-overlap gl-px-5 gl-py-5">
6666
<gl-search-box-by-type
6767
v-model.trim="searchTerm"
6868
:aria-label="$options.i18n.search"

app/assets/javascripts/boards/components/board_card_loading_skeleton.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default {
1111

1212
<template>
1313
<div
14-
class="board-card-skeleton gl-mb-3 gl-rounded-base gl-border-1 gl-border-solid gl-border-subtle gl-bg-white gl-p-5"
14+
class="board-card-skeleton gl-mb-3 gl-rounded-base gl-border-1 gl-border-solid gl-border-subtle gl-bg-default gl-p-5"
1515
>
1616
<div class="board-card-skeleton-inner">
1717
<gl-skeleton-loader :width="340" :height="100">

app/assets/javascripts/ci/pipeline_details/graph/components/graph_view_selector.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export default {
140140
<gl-loading-icon
141141
v-if="isSwitcherLoading"
142142
data-testid="switcher-loading-state"
143-
class="gl-absolute gl-z-2 gl-w-full gl-bg-white gl-opacity-5"
143+
class="gl-absolute gl-z-2 gl-w-full gl-bg-default gl-opacity-5"
144144
size="lg"
145145
/>
146146
<span class="gl-font-bold">{{ $options.i18n.viewLabelText }}</span>

app/assets/javascripts/ci/pipeline_editor/components/graph/job_pill.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default {
6161
<tooltip-on-truncate :title="jobName" truncate-target="child" placement="top">
6262
<div
6363
:id="id"
64-
class="gl-relative gl-z-1 gl-mb-3 gl-truncate gl-rounded-6 gl-bg-white gl-px-5 gl-py-3 gl-text-center gl-shadow-inner-1-gray-100 gl-duration-slow gl-ease-ease"
64+
class="gl-relative gl-z-1 gl-mb-3 gl-truncate gl-rounded-6 gl-bg-default gl-px-5 gl-py-3 gl-text-center gl-shadow-inner-1-gray-100 gl-duration-slow gl-ease-ease"
6565
:class="jobPillClasses"
6666
@mouseover="onMouseEnter"
6767
@mouseleave="onMouseLeave"

app/assets/javascripts/clusters_list/constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const CLUSTER_TYPES = {
5656
export const MAX_REQUESTS = 3;
5757

5858
export const STATUSES = {
59-
default: { className: 'gl-bg-white', title: __('Unknown') },
59+
default: { className: 'gl-bg-default', title: __('Unknown') },
6060
disabled: { className: 'disabled', title: __('Disabled') },
6161
created: { className: 'bg-success', title: __('Connected') },
6262
unreachable: { className: 'bg-danger', title: __('Unreachable') },

app/assets/javascripts/content_editor/components/bubble_menus/alert_bubble_menu.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export default {
8080
<template>
8181
<editor-state-observer :debounce="0" @transaction="updateAlertTypeToState">
8282
<bubble-menu
83-
class="gl-rounded-base gl-bg-white gl-shadow"
83+
class="gl-rounded-base gl-bg-overlap gl-shadow"
8484
plugin-key="bubbleMenuAlert"
8585
:should-show="shouldShow"
8686
:tippy-options="tippyOptions"

app/assets/javascripts/content_editor/components/bubble_menus/code_block_bubble_menu.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export default {
139139
<template>
140140
<bubble-menu
141141
data-testid="code-block-bubble-menu"
142-
class="gl-rounded-base gl-bg-white gl-shadow"
142+
class="gl-rounded-base gl-bg-overlap gl-shadow"
143143
plugin-key="bubbleMenuCodeBlock"
144144
:should-show="shouldShow"
145145
:tippy-options="tippyOptions()"

app/assets/javascripts/content_editor/components/bubble_menus/media_bubble_menu.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export default {
207207
>
208208
<bubble-menu
209209
data-testid="media-bubble-menu"
210-
class="gl-rounded-base gl-bg-white gl-shadow"
210+
class="gl-rounded-base gl-bg-overlap gl-shadow"
211211
plugin-key="bubbleMenuMedia"
212212
:should-show="shouldShow"
213213
@show="updateMediaInfoToState"

app/assets/javascripts/content_editor/components/bubble_menus/reference_bubble_menu.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export default {
157157
<editor-state-observer :debounce="0" @transaction="updateReferenceInfoToState">
158158
<bubble-menu
159159
v-show="isExpandable"
160-
class="gl-rounded-base gl-bg-white gl-shadow"
160+
class="gl-rounded-base gl-bg-overlap gl-shadow"
161161
plugin-key="bubbleMenuReference"
162162
:should-show="shouldShow"
163163
:tippy-options="$options.tippyOptions"

app/assets/javascripts/content_editor/components/wrappers/code_block.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ export default {
175175
v-if="node.attrs.showPreview"
176176
:contenteditable="false"
177177
data-testid="sandbox-preview"
178-
class="!-gl-ml-4 !-gl-mr-4 !-gl-mt-3 gl-mb-3 gl-border-b-1 gl-border-b-default !gl-bg-white gl-p-4 gl-border-b-solid"
178+
class="!-gl-ml-4 !-gl-mr-4 !-gl-mt-3 gl-mb-3 gl-border-b-1 gl-border-b-default !gl-bg-default gl-p-4 gl-border-b-solid"
179179
>
180180
<sandboxed-mermaid v-if="node.attrs.language === 'mermaid'" :source="diagramSource" />
181181
<img v-else ref="diagramContainer" :src="diagramUrl" />

app/assets/javascripts/deploy_keys/components/keys_panel.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default {
2525
</script>
2626

2727
<template>
28-
<div class="deploy-keys-panel table-holder gl-rounded-lg gl-bg-white">
28+
<div class="deploy-keys-panel table-holder gl-rounded-lg gl-bg-default">
2929
<template v-if="keys.length > 0">
3030
<div
3131
role="row"

app/assets/javascripts/design_management/components/design_scaler.vue

+5-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,11 @@ export default {
6262
:aria-label="__('Decrease')"
6363
@click="decrementScale"
6464
/>
65-
<span data-testid="scale-value" class="gl-border-t gl-border-b gl-bg-white gl-p-3 gl-text-sm">{{
66-
scaleLabel
67-
}}</span>
65+
<span
66+
data-testid="scale-value"
67+
class="gl-border-t gl-border-b gl-bg-default gl-p-3 gl-text-sm"
68+
>{{ scaleLabel }}</span
69+
>
6870
<gl-button
6971
icon="plus"
7072
:disabled="disableIncrease"

app/assets/javascripts/design_management/components/toolbar/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export default {
136136

137137
<template>
138138
<header
139-
class="js-design-header gl-border-b gl-flex gl-max-w-full gl-flex-col gl-justify-between gl-bg-white gl-py-4 gl-pl-5 md:gl-flex-row md:gl-items-center"
139+
class="js-design-header gl-border-b gl-flex gl-max-w-full gl-flex-col gl-justify-between gl-bg-default gl-py-4 gl-pl-5 md:gl-flex-row md:gl-items-center"
140140
>
141141
<div class="gl-mb-3 gl-flex gl-flex-row gl-items-center gl-overflow-hidden md:gl-mb-0">
142142
<div class="gl-mr-3 gl-flex gl-overflow-hidden">

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default {
8484
:tooltip-text="getTooltipText(note)"
8585
pseudo
8686
class="diff-comment-avatar js-diff-comment-avatar"
87-
css-classes="gl-bg-white"
87+
css-classes="gl-bg-default"
8888
@click.native="$emit('toggleLineDiscussions')"
8989
/>
9090
<span

app/assets/javascripts/environments/components/canary_ingress.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default {
6868
};
6969
</script>
7070
<template>
71-
<section class="gl-m-3 gl-flex gl-bg-white">
71+
<section class="gl-m-3 gl-flex gl-bg-default">
7272
<div class="gl-flex gl-flex-col">
7373
<label :for="stableWeightId" :class="$options.css.label" class="gl-rounded-tl-base">
7474
{{ $options.translations.stableLabel }}

app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_tree_item.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default {
3636
</script>
3737
<template>
3838
<div
39-
class="gl-rounded gl-relative gl-z-1 gl-flex gl-w-28 gl-border-1 gl-border-solid gl-border-strong gl-bg-white gl-p-3"
39+
class="gl-rounded gl-relative gl-z-1 gl-flex gl-w-28 gl-border-1 gl-border-solid gl-border-strong gl-bg-default gl-p-3"
4040
>
4141
<gl-icon :name="kindIcon" data-testid="resource-kind-icon" />
4242
<div class="gl-ml-4">

app/assets/javascripts/jira_connect/subscriptions/components/app.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export default {
9898
<template>
9999
<div>
100100
<header
101-
class="jira-connect-header gl-flex gl-items-center gl-justify-center gl-border-b-1 gl-border-b-default gl-bg-white gl-px-5 gl-border-b-solid"
101+
class="jira-connect-header gl-flex gl-items-center gl-justify-center gl-border-b-1 gl-border-b-default gl-bg-default gl-px-5 gl-border-b-solid"
102102
>
103103
<gl-link :href="gitlabUrl" target="_blank">
104104
<img :src="gitlabLogo" class="gl-h-6" :alt="__('GitLab')" />

app/assets/javascripts/kubernetes_dashboard/components/workload_stats.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
<gl-single-stat
3636
v-for="(stat, index) in stats"
3737
:key="index"
38-
class="gl-border gl-mx-3 gl-mt-3 gl-w-full gl-cursor-pointer gl-flex-col gl-items-center gl-justify-center gl-border-alpha-dark-8 gl-bg-white gl-p-3"
38+
class="gl-border gl-mx-3 gl-mt-3 gl-w-full gl-cursor-pointer gl-flex-col gl-items-center gl-justify-center gl-border-alpha-dark-8 gl-bg-default gl-p-3"
3939
:value="stat.value"
4040
:title="stat.title"
4141
:class="{ 'gl-shadow-inner-b-2-blue-500': active === stat.title }"

app/assets/javascripts/merge_request.js

+1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ MergeRequest.toggleDraftStatus = function (title, isReady) {
154154

155155
if (titleEl) {
156156
titleEl.textContent = title;
157+
document.title = title;
157158
}
158159

159160
const draftToggles = document.querySelectorAll('.js-draft-toggle-button');

0 commit comments

Comments
 (0)