Skip to content

Commit 495c2f3

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 4df10de commit 495c2f3

File tree

86 files changed

+585
-602
lines changed

Some content is hidden

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

86 files changed

+585
-602
lines changed

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

-18
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ export default {
5858
'app/assets/javascripts/ci/pipelines_page/components/pipelines_artifacts.vue',
5959
'app/assets/javascripts/ci/pipelines_page/pipelines.vue',
6060
'app/assets/javascripts/ci/reports/components/report_section.vue',
61-
'app/assets/javascripts/clusters_list/components/agents.vue',
62-
'app/assets/javascripts/clusters_list/components/delete_agent_button.vue',
63-
'app/assets/javascripts/clusters_list/components/install_agent_modal.vue',
6461
'app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue',
6562
'app/assets/javascripts/content_editor/components/bubble_menus/media_bubble_menu.vue',
6663
'app/assets/javascripts/content_editor/components/content_editor.vue',
@@ -76,7 +73,6 @@ export default {
7673
'app/assets/javascripts/custom_emoji/pages/index.vue',
7774
'app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue',
7875
'app/assets/javascripts/deploy_freeze/components/deploy_freeze_table.vue',
79-
'app/assets/javascripts/deployments/components/deployment_header.vue',
8076
'app/assets/javascripts/design_management/components/design_description/description_form.vue',
8177
'app/assets/javascripts/design_management/components/design_notes/design_discussion.vue',
8278
'app/assets/javascripts/design_management/components/design_notes/design_note.vue',
@@ -92,15 +88,6 @@ export default {
9288
'app/assets/javascripts/diffs/components/diff_view.vue',
9389
'app/assets/javascripts/diffs/components/image_diff_overlay.vue',
9490
'app/assets/javascripts/emoji/components/picker.vue',
95-
'app/assets/javascripts/environments/components/canary_update_modal.vue',
96-
'app/assets/javascripts/environments/components/deployment.vue',
97-
'app/assets/javascripts/environments/components/empty_state.vue',
98-
'app/assets/javascripts/environments/components/enable_review_app_modal.vue',
99-
'app/assets/javascripts/environments/components/environment_flux_resource_selector.vue',
100-
'app/assets/javascripts/environments/components/environment_form.vue',
101-
'app/assets/javascripts/environments/environment_details/components/deployment_actions.vue',
102-
'app/assets/javascripts/environments/environment_details/components/deployment_history.vue',
103-
'app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue',
10491
'app/assets/javascripts/error_tracking/components/error_details.vue',
10592
'app/assets/javascripts/error_tracking/components/error_tracking_list.vue',
10693
'app/assets/javascripts/error_tracking_settings/components/project_dropdown.vue',
@@ -144,8 +131,6 @@ export default {
144131
'app/assets/javascripts/invite_members/components/user_limit_notification.vue',
145132
'app/assets/javascripts/jira_connect/branches/components/new_branch_form.vue',
146133
'app/assets/javascripts/jira_import/components/jira_import_form.vue',
147-
'app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue',
148-
'app/assets/javascripts/kubernetes_dashboard/components/workload_details_drawer.vue',
149134
'app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue',
150135
'app/assets/javascripts/merge_request_dashboard/components/status_badge.vue',
151136
'app/assets/javascripts/merge_requests/components/reviewers/reviewer_drawer.vue',
@@ -448,9 +433,6 @@ export default {
448433
'ee/app/assets/javascripts/projects/components/move_personal_project_to_group_modal.vue',
449434
'ee/app/assets/javascripts/projects/merge_requests/blocking_mr_input_root.vue',
450435
'ee/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue',
451-
'ee/app/assets/javascripts/protected_environments/create_protected_environment.vue',
452-
'ee/app/assets/javascripts/protected_environments/edit_protected_environment_rules_card.vue',
453-
'ee/app/assets/javascripts/protected_environments/protected_environments.vue',
454436
'ee/app/assets/javascripts/related_items_tree/components/create_epic_form.vue',
455437
'ee/app/assets/javascripts/related_items_tree/components/related_items_tree_app.vue',
456438
'ee/app/assets/javascripts/related_items_tree/components/related_items_tree_header_actions.vue',

‎.markdownlint-cli2.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,5 @@ config:
162162
]
163163
ignores:
164164
- "doc/architecture"
165+
customRules:
166+
- "./doc/.markdownlint/rules/unnecessary_traversal.js"

‎app/assets/javascripts/clusters_list/components/agent_table.vue

-6
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ export default {
6969
required: true,
7070
type: Array,
7171
},
72-
defaultBranchName: {
73-
default: '.noBranch',
74-
required: false,
75-
type: String,
76-
},
7772
maxAgents: {
7873
default: null,
7974
required: false,
@@ -423,7 +418,6 @@ export default {
423418
v-if="action.name === 'delete-agent'"
424419
:key="action.name"
425420
:agent="item"
426-
:default-branch-name="defaultBranchName"
427421
/>
428422
<gl-disclosure-dropdown-item
429423
v-else

‎app/assets/javascripts/clusters_list/components/agents.vue

+1-7
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ export default {
119119
},
120120
data() {
121121
return {
122-
folderList: {},
123122
feedbackBannerDismissed: false,
124123
queryErrored: false,
125124
sharedAgentsQueryErrored: false,
@@ -292,12 +291,7 @@ export default {
292291
{{ $options.i18n.error }}
293292
</gl-alert>
294293

295-
<agent-table
296-
v-else
297-
:agents="tab.agents"
298-
:default-branch-name="defaultBranchName"
299-
:max-agents="limit"
300-
/>
294+
<agent-table v-else :agents="tab.agents" :max-agents="limit" />
301295
</gl-tab>
302296

303297
<gl-tab v-if="availableConfigs.length" :title="$options.i18n.availableConfigs">

‎app/assets/javascripts/clusters_list/components/delete_agent_button.vue

-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ export default {
3636
type: Object,
3737
validator: (value) => ['id', 'name'].every((prop) => value[prop]),
3838
},
39-
defaultBranchName: {
40-
default: '.noBranch',
41-
required: false,
42-
type: String,
43-
},
4439
},
4540
data() {
4641
return {

‎app/assets/javascripts/clusters_list/components/install_agent_modal.vue

+2
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ export default {
194194
}
195195
this.registerAgent();
196196
},
197+
// This method is triggered from outside of the component
198+
// eslint-disable-next-line vue/no-unused-properties
197199
showModalForAgent(name) {
198200
this.agentName = name;
199201
this.$refs.modal?.show();

‎app/assets/javascripts/deployments/components/deployment_header.vue

-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ export default {
5555
},
5656
},
5757
computed: {
58-
iid() {
59-
return this.deployment.iid;
60-
},
6158
status() {
6259
return this.deployment.status?.toLowerCase() ?? '';
6360
},

‎app/assets/javascripts/environments/components/canary_update_modal.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default {
4848
static: true,
4949
},
5050
data() {
51-
return { error: '', dismissed: true };
51+
return { error: '' };
5252
},
5353
computed: {
5454
stableWeight() {

‎app/assets/javascripts/environments/components/deployment.vue

-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ export default {
7171
const dateTime = new Date(this.deploymentTime);
7272
return localeDateFormat.asDateTimeFull.format(dateTime);
7373
},
74-
createdAt() {
75-
return this.deployment?.createdAt;
76-
},
7774
commit() {
7875
return this.deployment?.commit;
7976
},

‎app/assets/javascripts/environments/components/empty_state.vue

-8
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ export default {
2424
default: false,
2525
},
2626
},
27-
computed: {
28-
title() {
29-
return this.hasTerm ? this.$options.i18n.searchingTitle : this.$options.i18n.title;
30-
},
31-
content() {
32-
return this.hasTerm ? this.$options.i18n.searchingContent : this.$options.i18n.content;
33-
},
34-
},
3527
i18n: {
3628
title: s__('Environments|Get started with environments'),
3729
content: s__(

‎app/assets/javascripts/environments/components/enable_review_app_modal.vue

-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ export default {
4747
- if: $CI_PIPELINE_SOURCE == "merge_request_event"`;
4848
},
4949
},
50-
methods: {
51-
commaOrPeriod(index, length) {
52-
return index + 1 === length ? '.' : ',';
53-
},
54-
},
5550
i18n,
5651
configuringReviewAppsPath: helpPagePath('ci/review_apps/_index.md', {
5752
anchor: 'configure-review-apps',

‎app/assets/javascripts/environments/components/environment_flux_resource_selector.vue

+2-8
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ export default {
6161
fluxKustomizations: {
6262
query: fluxKustomizationsQuery,
6363
variables() {
64-
return {
65-
configuration: this.configuration,
66-
namespace: this.namespace,
67-
};
64+
return this.variables;
6865
},
6966
skip() {
7067
return !this.namespace;
@@ -85,10 +82,7 @@ export default {
8582
fluxHelmReleases: {
8683
query: fluxHelmReleasesQuery,
8784
variables() {
88-
return {
89-
configuration: this.configuration,
90-
namespace: this.namespace,
91-
};
85+
return this.variables;
9286
},
9387
skip() {
9488
return !this.namespace;

‎app/assets/javascripts/environments/components/environment_form.vue

-4
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,9 @@ export default {
103103
selectedAgentId: this.environment.clusterAgentId,
104104
agentSearchTerm: '',
105105
selectedNamespace: this.environment.kubernetesNamespace,
106-
kubernetesError: '',
107106
};
108107
},
109108
computed: {
110-
loadingNamespacesList() {
111-
return this.$apollo.queries.k8sNamespaces.loading;
112-
},
113109
isNameDisabled() {
114110
return Boolean(this.environment.id);
115111
},

‎app/assets/javascripts/environments/environment_details/components/deployment_actions.vue

-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ export default {
8080
isActionsShown() {
8181
return this.actions.length > 0;
8282
},
83-
deploymentIid() {
84-
return this.approvalEnvironment.deploymentIid;
85-
},
8683
environment() {
8784
return this.approvalEnvironment.environment;
8885
},

‎app/assets/javascripts/environments/environment_details/components/deployment_history.vue

-3
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ export default {
104104
isPaginationDisabled() {
105105
return this.isLoading || this.isPrefetchingPages;
106106
},
107-
pollingInterval() {
108-
return this.graphqlEtagKey ? ENVIRONMENT_DETAILS_QUERY_POLLING_INTERVAL : null;
109-
},
110107
isDirectionAscending() {
111108
return this.sortDirection === DIRECTION_ASCENDING;
112109
},

‎app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ export default {
132132
podsLoading: false,
133133
activeTab: k8sResourceType.k8sPods,
134134
fluxApiError: '',
135-
focusedElement: null,
136135
podToDelete: {},
137136
fluxHelmRelease: {},
138137
fluxKustomization: {},

‎app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ export default {
179179
</gl-badge>
180180
</div>
181181
</workload-details-item>
182-
<workload-details-item v-if="item.status && !item.fullStatus" :label="$options.i18n.status">
182+
<workload-details-item v-if="item.status && !hasFullStatus" :label="$options.i18n.status">
183183
<gl-badge :variant="$options.WORKLOAD_STATUS_BADGE_VARIANTS[item.status]">{{
184184
$options.STATUS_LABELS[item.status]
185185
}}</gl-badge>
186186
</workload-details-item>
187187
<workload-details-item
188-
v-if="item.fullStatus"
188+
v-if="hasFullStatus"
189189
:label="$options.i18n.status"
190190
:is-expanded="expanded.status"
191191
collapsible

‎app/assets/javascripts/kubernetes_dashboard/components/workload_details_drawer.vue

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ export default {
4141
onDeletePod(pod) {
4242
this.$emit('delete-pod', pod);
4343
},
44+
// This method is triggered from outside of the component
45+
// eslint-disable-next-line vue/no-unused-properties
4446
toggle(item, section) {
4547
if (!isEqual(item, this.selectedItem)) {
4648
this.open(item, section);

‎app/assets/javascripts/todos/components/todos_filter_bar.vue

+1-14
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ import {
1515
import Tracking from '~/tracking';
1616
import {
1717
TODO_TARGET_TYPE_ISSUE,
18-
TODO_TARGET_TYPE_WORK_ITEM,
1918
TODO_TARGET_TYPE_MERGE_REQUEST,
2019
TODO_TARGET_TYPE_DESIGN,
2120
TODO_TARGET_TYPE_ALERT,
22-
TODO_TARGET_TYPE_EPIC,
2321
TODO_TARGET_TYPE_SSH_KEY,
2422
TODO_TARGET_TYPE_WIKI_PAGE,
2523
TODO_ACTION_TYPE_ASSIGNED,
@@ -65,12 +63,7 @@ export const TARGET_TYPES = [
6563
// eslint-disable-next-line @gitlab/require-i18n-strings
6664
id: 'Issue',
6765
value: TODO_TARGET_TYPE_ISSUE,
68-
title: s__('Todos|Issue'),
69-
},
70-
{
71-
id: 'WorkItem',
72-
value: TODO_TARGET_TYPE_WORK_ITEM,
73-
title: s__('Todos|Work item'),
66+
title: s__('Todos|Issue or Epic'),
7467
},
7568
{
7669
id: 'MergeRequest',
@@ -87,12 +80,6 @@ export const TARGET_TYPES = [
8780
value: TODO_TARGET_TYPE_ALERT,
8881
title: s__('Todos|Alert'),
8982
},
90-
{
91-
// eslint-disable-next-line @gitlab/require-i18n-strings
92-
id: 'Epic',
93-
value: TODO_TARGET_TYPE_EPIC,
94-
title: s__('Todos|Epic'),
95-
},
9683
{
9784
// eslint-disable-next-line @gitlab/require-i18n-strings
9885
id: 'Key',

‎app/assets/javascripts/todos/constants.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export const TODO_STATE_DONE = 'done';
44
export const TODO_STATE_PENDING = 'pending';
55

66
export const TODO_TARGET_TYPE_ISSUE = 'ISSUE';
7-
export const TODO_TARGET_TYPE_WORK_ITEM = 'WORKITEM';
87
export const TODO_TARGET_TYPE_MERGE_REQUEST = 'MERGEREQUEST';
98
export const TODO_TARGET_TYPE_DESIGN = 'DESIGN';
109
export const TODO_TARGET_TYPE_ALERT = 'ALERT';

‎app/assets/javascripts/vue_shared/components/design_management/design_note_pin.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export default {
9191
v-if="isNewNote"
9292
name="image-comment-dark"
9393
:size="24"
94-
class="gl-rounded-full gl-border-2 gl-border-solid gl-border-white gl-bg-white"
94+
class="gl-rounded-full gl-border-2 gl-border-solid gl-border-neutral-0 gl-bg-neutral-0 gl-text-neutral-950"
9595
/>
9696
<template v-else>
9797
{{ label }}

‎app/assets/javascripts/vue_shared/components/visibility_icon_button.vue

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script>
22
import { GlButton, GlIcon, GlTooltipDirective } from '@gitlab/ui';
3-
import { __ } from '~/locale';
43
import {
54
GROUP_VISIBILITY_TYPE,
65
PROJECT_VISIBILITY_TYPE,
@@ -32,17 +31,10 @@ export default {
3231
},
3332
},
3433
computed: {
35-
isBannedProject() {
36-
return !this.isGroup && this.visibilityLevel === 'banned';
37-
},
3834
visibilityIcon() {
39-
return this.isBannedProject ? 'spam' : VISIBILITY_TYPE_ICON[this.visibilityLevel];
35+
return VISIBILITY_TYPE_ICON[this.visibilityLevel];
4036
},
4137
visibilityTooltip() {
42-
if (this.isBannedProject) {
43-
return __('This project is hidden because its creator has been banned');
44-
}
45-
4638
if (this.isGroup) {
4739
return GROUP_VISIBILITY_TYPE[this.visibilityLevel];
4840
}

‎app/assets/stylesheets/components/rapid_diffs/text_file_viewers.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
.rd-hunk-header {
2929
// this is used when a hunk header doesn't have any text, only expand buttons
3030
min-height: calc(1em * $code-line-height);
31-
border-top: 1px solid var(--rd-hunk-header-border-color, $gray-100);
32-
border-bottom: 1px solid var(--rd-hunk-header-border-color, $gray-100);
31+
border-top: 1px solid var(--rd-hunk-header-border-color, var(--gl-border-color-default));
32+
border-bottom: 1px solid var(--rd-hunk-header-border-color, var(--gl-border-color-default));
3333
background-color: var(--rd-hunk-header-background-color, $gray-50);
3434
color: var(--rd-hunk-header-color, $gray-400);
3535

‎app/assets/stylesheets/framework/layout.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ html {
125125
padding-left: $gl-padding;
126126
padding-right: $gl-padding;
127127
box-shadow: none;
128-
background-color: $gray-10;
129-
border-left: 1px solid $gray-100;
128+
@apply gl-bg-subtle gl-border-l;
130129

131130
@include media-breakpoint-down(sm) {
132131
min-width: unset;

‎app/assets/stylesheets/framework/sidebar.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@
244244
@apply gl-transition-width;
245245
height: $toggle-sidebar-height;
246246
padding: 0 $gl-padding;
247-
background-color: $gray-10;
247+
@apply gl-bg-subtle;
248248
border: 0;
249249
@apply gl-text-subtle;
250250
display: flex;
251251
align-items: center;
252252
@apply gl-border-b;
253253

254254
&:hover {
255-
background-color: $gray-100;
255+
@apply gl-bg-strong;
256256
@apply gl-text-default;
257257
}
258258
}

0 commit comments

Comments
 (0)