Skip to content
Snippets Groups Projects
Commit 2eaa98f2 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖
Browse files

Automatic merge of gitlab-org/gitlab master

parents 85030933 4b1e65aa
No related branches found
No related tags found
No related merge requests found
Showing
with 36 additions and 25 deletions
......@@ -51,10 +51,6 @@ export default {
},
methods: {
...mapActions(['toggleBoardItem', 'setAssignees']),
updateAssignees(data) {
const assignees = data.issueSetAssignees?.issue?.assignees?.nodes || [];
this.setAssignees(assignees);
},
handleClose() {
this.toggleBoardItem({ boardItem: this.activeIssue, sidebarType: this.sidebarType });
},
......@@ -78,7 +74,7 @@ export default {
:full-path="fullPath"
:initial-assignees="activeIssue.assignees"
class="assignee"
@assignees-updated="updateAssignees"
@assignees-updated="setAssignees"
/>
<board-sidebar-epic-select class="epic" />
<div>
......
......@@ -69,6 +69,7 @@ export default {
'milestoneTitle',
'releaseTag',
'search',
'myReactionEmoji',
]);
filterParams.not = transformNotFilters(filters);
commit(types.SET_FILTERS, filterParams);
......
......@@ -66,8 +66,8 @@ export default {
},
listClasses() {
return {
'gl-pl-7': this.nestedLevel === 1,
'gl-pl-9': this.nestedLevel === 2,
'gl-pl-9': this.nestedLevel === 1,
'gl-pl-11-5': this.nestedLevel === 2,
};
},
},
......
......@@ -88,8 +88,8 @@ export default {
},
listClasses() {
return {
'gl-pl-7': this.nestedLevel === 1,
'gl-pl-8': this.nestedLevel === 2,
'gl-pl-9': this.nestedLevel === 1,
'gl-pl-11-5': this.nestedLevel === 2,
};
},
},
......
......@@ -51,7 +51,7 @@ export default {
if (!this.nestedSummary) {
return ['gl-px-5'];
}
return ['gl-pl-7', 'gl-pr-5', { 'gl-bg-gray-10': this.statusIcon === ICON_WARNING }];
return ['gl-pl-9', 'gl-pr-5', { 'gl-bg-gray-10': this.statusIcon === ICON_WARNING }];
},
statusIconSize() {
if (!this.nestedSummary) {
......
......@@ -24,7 +24,7 @@ export default {
n__(
'Reports|Failed %{count} time in %{base_branch} in the last 14 days',
'Reports|Failed %{count} times in %{base_branch} in the last 14 days',
this.issue.recent_failures.count,
this.issue.recent_failures?.count,
),
this.issue.recent_failures,
);
......@@ -44,20 +44,20 @@ export default {
<template>
<div class="gl-display-flex gl-mt-2 gl-mb-2">
<issue-status-icon :status="status" :status-icon-size="24" class="gl-mr-3" />
<gl-badge
v-if="showRecentFailures"
variant="warning"
class="gl-mr-2"
data-testid="test-issue-body-recent-failures"
>
{{ recentFailureMessage }}
</gl-badge>
<gl-button
button-text-classes="gl-white-space-normal! gl-word-break-all gl-text-left"
variant="link"
data-testid="test-issue-body-description"
@click="openModal({ issue })"
>
<gl-badge
v-if="showRecentFailures"
variant="warning"
class="gl-mr-2"
data-testid="test-issue-body-recent-failures"
>
{{ recentFailureMessage }}
</gl-badge>
{{ issue.name }}
</gl-button>
</div>
......
......@@ -9,6 +9,7 @@ import {
GlDropdownItem,
GlIcon,
} from '@gitlab/ui';
import { isEmpty } from 'lodash';
import { __, s__ } from '~/locale';
import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
import {
......@@ -79,7 +80,7 @@ export default {
return Object.keys(this.selectedPlatform).length > 0;
},
instructionsEmpty() {
return Object.keys(this.instructions).length === 0;
return isEmpty(this.instructions);
},
groupId() {
return this.group?.id ?? '';
......@@ -212,10 +213,7 @@ export default {
<pre
class="gl-bg-gray gl-flex-fill-1 gl-white-space-pre-line"
data-testid="binary-instructions"
>
{{ instructions.installInstructions }}
</pre
>{{ instructions.installInstructions }}</pre
>
<modal-copy-button
:title="$options.i18n.copyInstructions"
......
......@@ -19,5 +19,5 @@
type: 'group',
reset_token_url: reset_registration_token_group_settings_ci_cd_path,
project_path: '',
group_path: @group.path }
group_path: @group.full_path }
%br
---
title: Fix updating GraphQL boards cards on assignees update
merge_request: 57687
author:
type: fixed
---
title: Display error message when runner installation instructions modal cannot be
loaded correctly
merge_request: 57588
author:
type: fixed
---
title: Fix test report merge request widget summary and issues alignment
merge_request: 56768
author:
type: fixed
doc/install/azure/img/azure-add-inbound-sec-rule-http.png

16.5 KiB

doc/install/azure/img/azure-add-inbound-sec-rule-ssh.png

16.4 KiB

doc/install/azure/img/azure-create-virtual-machine-basics-password.png

24.3 KiB

doc/install/azure/img/azure-create-virtual-machine-basics.png

22.4 KiB

doc/install/azure/img/azure-create-virtual-machine-deployment.png

23.2 KiB

doc/install/azure/img/azure-create-virtual-machine-purchase.png

42.7 KiB

doc/install/azure/img/azure-create-virtual-machine-settings.png

25.1 KiB

doc/install/azure/img/azure-create-virtual-machine-size.png

32.5 KiB

doc/install/azure/img/azure-dashboard-highlight-nsg.png

33.4 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment