@@ -360,8 +385,14 @@ export default {
:is-author-contributor="note.authorIsContributor"
:max-access-level-of-author="note.maxAccessLevelOfAuthor"
:project-name="projectName"
+ :can-resolve="canResolve"
+ :resolvable="isDiscussionResolvable"
+ :is-resolved="isDiscussionResolved"
+ :is-resolving="isResolving"
+ :resolved-by="discussionResolvedBy"
@startReplying="showReplyForm"
@startEditing="startEditing"
+ @resolve="$emit('resolve')"
@error="($event) => $emit('error', $event)"
@notifyCopyDone="notifyCopyDone"
@deleteNote="$emit('deleteNote')"
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue b/app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue
index 4fcd905d0b8..5bf1600f7f2 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue
@@ -21,6 +21,7 @@ export default {
assignUserText: __('Assign to commenting user'),
unassignUserText: __('Unassign from commenting user'),
reportAbuseText: __('Report abuse'),
+ resolveThreadTitle: __('Resolve thread'),
},
components: {
EmojiPicker: () => import('~/emoji/components/picker.vue'),
@@ -108,6 +109,31 @@ export default {
required: false,
default: '',
},
+ canResolve: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
+ resolvable: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
+ isResolved: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
+ isResolving: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
+ resolvedBy: {
+ type: Object,
+ required: false,
+ default: () => ({}),
+ },
},
computed: {
assignUserActionText() {
@@ -131,8 +157,21 @@ export default {
name: this.projectName,
});
},
+ resolveIcon() {
+ if (!this.isResolving) {
+ return this.isResolved ? 'check-circle-filled' : 'check-circle';
+ }
+ return null;
+ },
+ resolveVariant() {
+ return this.isResolved ? 'success' : 'default';
+ },
+ resolveThreadTitle() {
+ return this.isResolved
+ ? __('Resolved by ') + this.resolvedBy.name
+ : this.$options.i18n.resolveThreadTitle;
+ },
},
-
methods: {
async setAwardEmoji(name) {
const { mutation, mutationName, errorMessage } = getMutation({ note: this.note, name });
@@ -199,6 +238,20 @@ export default {
>
{{ __('Contributor') }}
+
import('ee_component/work_items/components/work_item_weight.vue'),
WorkItemProgress: () => import('ee_component/work_items/components/work_item_progress.vue'),
WorkItemIteration: () => import('ee_component/work_items/components/work_item_iteration.vue'),
@@ -139,6 +142,9 @@ export default {
hasParent() {
return this.workItemHierarchy?.hasParent;
},
+ workItemCrmContacts() {
+ return this.isWidgetPresent(WIDGET_TYPE_CRM_CONTACTS) && this.glFeatures.workItemsAlpha;
+ },
},
methods: {
isWidgetPresent(type) {
@@ -168,6 +174,15 @@ export default {
"
/>
+
+
+
+import { GlIcon, GlLink, GlPopover } from '@gitlab/ui';
+import { difference, groupBy, xor } from 'lodash';
+import { findWidget } from '~/issues/list/utils';
+import { __, n__, s__ } from '~/locale';
+import WorkItemSidebarDropdownWidget from '~/work_items/components/shared/work_item_sidebar_dropdown_widget.vue';
+import Tracking from '~/tracking';
+import getGroupContactsQuery from '~/crm/contacts/components/graphql/get_group_contacts.query.graphql';
+import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
+import updateWorkItemMutation from '../graphql/update_work_item.mutation.graphql';
+import updateNewWorkItemMutation from '../graphql/update_new_work_item.mutation.graphql';
+import {
+ i18n,
+ TRACKING_CATEGORY_SHOW,
+ I18N_WORK_ITEM_ERROR_FETCHING_CRM_CONTACTS,
+ WIDGET_TYPE_CRM_CONTACTS,
+} from '../constants';
+import { newWorkItemFullPath, newWorkItemId } from '../utils';
+
+export default {
+ components: {
+ GlIcon,
+ GlLink,
+ GlPopover,
+ WorkItemSidebarDropdownWidget,
+ },
+ mixins: [Tracking.mixin()],
+ props: {
+ fullPath: {
+ type: String,
+ required: true,
+ },
+ workItemId: {
+ type: String,
+ required: true,
+ },
+ workItemIid: {
+ type: String,
+ required: true,
+ },
+ workItemType: {
+ type: String,
+ required: true,
+ },
+ },
+ data() {
+ return {
+ searchTerm: '',
+ searchStarted: false,
+ updateInProgress: false,
+ };
+ },
+ computed: {
+ createFlow() {
+ return this.workItemId === newWorkItemId(this.workItemType);
+ },
+ selectedItems() {
+ return this.workItemCrmContacts?.contacts.nodes || [];
+ },
+ isLoading() {
+ return this.$apollo.queries.searchItems.loading;
+ },
+ selectedItemIds() {
+ return this.selectedItems.map(({ id }) => id);
+ },
+ listItems() {
+ const contacts = this.searchItems || [];
+ const organizations = this.groupByOrganization(contacts, true);
+ return organizations.map(([key, values]) => {
+ return {
+ text: key,
+ options: values.map((contact) => {
+ return { value: contact.id, text: `${contact.firstName} ${contact.lastName}` };
+ }),
+ };
+ });
+ },
+ tracking() {
+ return {
+ category: TRACKING_CATEGORY_SHOW,
+ label: 'item_contact',
+ property: `type_${this.workItemType}`,
+ };
+ },
+ selectedOrganizations() {
+ return this.groupByOrganization(this.selectedItems, false);
+ },
+ workItemCrmContacts() {
+ return findWidget(WIDGET_TYPE_CRM_CONTACTS, this.workItem);
+ },
+ workItemFullPath() {
+ return this.createFlow
+ ? newWorkItemFullPath(this.fullPath, this.workItemType)
+ : this.fullPath;
+ },
+ canUpdate() {
+ return this.workItem?.userPermissions?.updateWorkItem;
+ },
+ dropdownLabelText() {
+ return n__('%d contact', '%d contacts', this.selectedItemIds.length);
+ },
+ },
+ apollo: {
+ searchItems: {
+ query: getGroupContactsQuery,
+ variables() {
+ return {
+ groupFullPath: this.fullPath.split('/')[0],
+ searchTerm: this.searchTerm,
+ };
+ },
+ skip() {
+ return !this.searchStarted;
+ },
+ update(data) {
+ return data.group?.contacts?.nodes;
+ },
+ error() {
+ this.$emit('error', I18N_WORK_ITEM_ERROR_FETCHING_CRM_CONTACTS);
+ },
+ },
+ workItem: {
+ query: workItemByIidQuery,
+ variables() {
+ return {
+ fullPath: this.workItemFullPath,
+ iid: this.workItemIid,
+ };
+ },
+ update(data) {
+ return data?.workspace?.workItem ?? {};
+ },
+ skip() {
+ return !this.workItemIid;
+ },
+ },
+ },
+ methods: {
+ groupByOrganization(unsortedContacts, separateSelectedContacts) {
+ // Sort the contacts first
+ const contacts = [...unsortedContacts].sort((a, b) => {
+ if (a.firstName !== b.firstName) {
+ return a.firstName.localeCompare(b.firstName);
+ }
+ return a.lastName.localeCompare(b.lastName);
+ });
+
+ let groups = [];
+ let remainingContacts;
+ // Group the selected contacts first
+ if (separateSelectedContacts && this.selectedItems.length) {
+ remainingContacts = contacts.filter(
+ (contact) => !this.selectedItemIds.includes(contact.id),
+ );
+ groups.push([
+ __('Selected'),
+ contacts.filter((contact) => this.selectedItemIds.includes(contact.id)),
+ ]);
+ } else {
+ remainingContacts = contacts;
+ }
+
+ const orphanContacts = remainingContacts.filter(({ organization }) => !organization);
+ // Display each organization and their contacts next
+ remainingContacts = remainingContacts.filter(({ organization }) => organization);
+ const organizationGroups = Object.entries(groupBy(remainingContacts, 'organization.name'));
+ organizationGroups.sort((a, b) => a[0].localeCompare(b[0]));
+ groups = groups.concat(organizationGroups);
+
+ // Then finally display contacts without an organization
+ if (orphanContacts.length) {
+ groups.push([s__('Crm|No organization'), orphanContacts]);
+ }
+ return groups;
+ },
+ search(searchTerm = '') {
+ this.searchTerm = searchTerm;
+ this.searchStarted = true;
+ },
+ async updateItems(newSelectedItemIds) {
+ this.updateInProgress = true;
+ let newSelectedItems;
+
+ const differingItems = xor(newSelectedItemIds, this.selectedItemIds);
+
+ if (differingItems === 0) return;
+ if (newSelectedItemIds.length === 0) {
+ newSelectedItems = [];
+ } else {
+ const removeIds = difference(this.selectedItemIds, newSelectedItemIds);
+ if (removeIds.length > 0) {
+ newSelectedItems = this.selectedItems.filter(({ id }) => !removeIds.includes(id));
+ }
+
+ const addIds = difference(newSelectedItemIds, this.selectedItemIds);
+ if (addIds.length > 0) {
+ newSelectedItems = [
+ ...this.selectedItems,
+ ...this.searchItems.filter(({ id }) => addIds.includes(id)),
+ ];
+ }
+ }
+
+ if (this.createFlow) {
+ this.$apollo.mutate({
+ mutation: updateNewWorkItemMutation,
+ variables: {
+ input: {
+ workItemType: this.workItemType,
+ fullPath: this.fullPath,
+ crmContacts: newSelectedItems,
+ },
+ },
+ });
+
+ this.updateInProgress = false;
+ return;
+ }
+
+ try {
+ const {
+ data: {
+ workItemUpdate: { errors },
+ },
+ } = await this.$apollo.mutate({
+ mutation: updateWorkItemMutation,
+ variables: {
+ input: {
+ id: this.workItemId,
+ crmContactsWidget: {
+ contactIds: newSelectedItemIds,
+ },
+ },
+ },
+ });
+
+ if (errors.length > 0) {
+ throw new Error(errors[0].message);
+ }
+
+ this.track('updated_contacts');
+ } catch {
+ this.$emit('error', i18n.updateError);
+ } finally {
+ this.searchTerm = '';
+ this.updateInProgress = false;
+ }
+ },
+ },
+};
+
+
+
+
+
+
+
+
{{ organizationName }}
+
+
+ {{ contact.firstName }} {{ contact.lastName }}
+
+
+ {{ contact.firstName }} {{ contact.lastName }}
+
+
{{ contact.description }}
+
+ {{ contact.email }}
+
+
+ {{ contact.phone }}
+
+
+ {{ organizationName }}
+
+
+
+
+
test3
',
+ system: false,
+ internal: false,
+ systemNoteIconName: null,
+ createdAt: '2024-07-19T05:52:01Z',
+ lastEditedAt: '2024-07-26T10:06:02Z',
+ url: 'http://127.0.0.1:3000/flightjs/Flight/-/issues/134#note_2506',
+ authorIsContributor: false,
+ maxAccessLevelOfAuthor: 'Owner',
+ lastEditedBy: null,
+ discussion: {
+ id: 'gid://gitlab/Discussion/c4be5bec43a737e0966dbc4c040b1517e7febfa9',
+ resolved: true,
+ resolvable: true,
+ resolvedBy: {
+ id: 'gid://gitlab/User/1',
+ name: 'Administrator',
+ __typename: 'UserCore',
+ },
+ __typename: 'Discussion',
+ },
+ author: {
+ id: 'gid://gitlab/User/1',
+ avatarUrl:
+ 'https://www.gravatar.com/avatar/258d8dc916db8cea2cafb6c3cd0cb0246efe061421dbd83ec3a350428cabda4f?s=80&d=identicon',
+ name: 'Administrator',
+ username: 'root',
+ webUrl: 'http://127.0.0.1:3000/root',
+ webPath: '/root',
+ __typename: 'UserCore',
+ },
+ awardEmoji: {
+ nodes: [],
+ __typename: 'AwardEmojiConnection',
+ },
+ userPermissions: {
+ adminNote: true,
+ awardEmoji: true,
+ readNote: true,
+ createNote: true,
+ resolveNote: true,
+ repositionNote: true,
+ __typename: 'NotePermissions',
+ },
+ systemNoteMetadata: null,
+ __typename: 'Note',
+ },
+ {
+ id: 'gid://gitlab/DiscussionNote/2539',
+ body: 'comment',
+ bodyHtml: 'comment
',
+ system: false,
+ internal: false,
+ systemNoteIconName: null,
+ createdAt: '2024-07-23T05:07:46Z',
+ lastEditedAt: '2024-07-26T10:06:02Z',
+ url: 'http://127.0.0.1:3000/flightjs/Flight/-/issues/134#note_2539',
+ authorIsContributor: false,
+ maxAccessLevelOfAuthor: 'Owner',
+ lastEditedBy: null,
+ discussion: {
+ id: 'gid://gitlab/Discussion/c4be5bec43a737e0966dbc4c040b1517e7febfa9',
+ resolved: true,
+ resolvable: true,
+ resolvedBy: {
+ id: 'gid://gitlab/User/1',
+ name: 'Administrator',
+ __typename: 'UserCore',
+ },
+ __typename: 'Discussion',
+ },
+ author: {
+ id: 'gid://gitlab/User/1',
+ avatarUrl:
+ 'https://www.gravatar.com/avatar/258d8dc916db8cea2cafb6c3cd0cb0246efe061421dbd83ec3a350428cabda4f?s=80&d=identicon',
+ name: 'Administrator',
+ username: 'root',
+ webUrl: 'http://127.0.0.1:3000/root',
+ webPath: '/root',
+ __typename: 'UserCore',
+ },
+ awardEmoji: {
+ nodes: [],
+ __typename: 'AwardEmojiConnection',
+ },
+ userPermissions: {
+ adminNote: true,
+ awardEmoji: true,
+ readNote: true,
+ createNote: true,
+ resolveNote: true,
+ repositionNote: true,
+ __typename: 'NotePermissions',
+ },
+ systemNoteMetadata: null,
+ __typename: 'Note',
+ },
+ ],
+ __typename: 'NoteConnection',
+ },
+ __typename: 'Discussion',
+ },
+ errors: [],
+ __typename: 'DiscussionToggleResolvePayload',
+ },
+ },
+};
diff --git a/spec/frontend/work_items/notes/award_utils_spec.js b/spec/frontend/work_items/notes/award_utils_spec.js
index 62c4835aa5a..e3e5024bc9f 100644
--- a/spec/frontend/work_items/notes/award_utils_spec.js
+++ b/spec/frontend/work_items/notes/award_utils_spec.js
@@ -6,9 +6,9 @@ import workItemNotesByIidQuery from '~/work_items/graphql/notes/work_item_notes_
import addAwardEmojiMutation from '~/work_items/graphql/notes/work_item_note_add_award_emoji.mutation.graphql';
import removeAwardEmojiMutation from '~/work_items/graphql/notes/work_item_note_remove_award_emoji.mutation.graphql';
import {
- mockWorkItemNotesResponseWithComments,
mockAwardEmojiThumbsUp,
mockAwardEmojiThumbsDown,
+ mockWorkItemNotesResponseWithComments,
} from '../mock_data';
function getWorkItem(data) {
diff --git a/spec/helpers/projects/pipeline_helper_spec.rb b/spec/helpers/projects/pipeline_helper_spec.rb
index 5fdd83b4884..fd08fc5eeb1 100644
--- a/spec/helpers/projects/pipeline_helper_spec.rb
+++ b/spec/helpers/projects/pipeline_helper_spec.rb
@@ -36,6 +36,10 @@ RSpec.describe Projects::PipelineHelper do
end
describe '#js_pipeline_header_data' do
+ before do
+ allow(helper).to receive(:current_user).and_return(user)
+ end
+
subject(:pipeline_header_data) { helper.js_pipeline_header_data(project, pipeline) }
it 'returns pipeline header data' do
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index b05b9dc0710..a9b5b4fcead 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -80,6 +80,7 @@ issues:
- email
- issuable_resource_links
- synced_epic
+- observability_metrics
work_item_type:
- issues
- namespace
diff --git a/spec/services/projects/prometheus/metrics/destroy_service_spec.rb b/spec/services/projects/prometheus/metrics/destroy_service_spec.rb
deleted file mode 100644
index 4c2a959a149..00000000000
--- a/spec/services/projects/prometheus/metrics/destroy_service_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Projects::Prometheus::Metrics::DestroyService, feature_category: :metrics do
- let(:metric) { create(:prometheus_metric) }
-
- subject { described_class.new(metric) }
-
- it 'destroys metric' do
- subject.execute
-
- expect(PrometheusMetric.find_by(id: metric.id)).to be_nil
- end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3aa6a0d72d3..e5d7f2bba46 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -34,7 +34,7 @@ require 'rspec-parameterized'
require 'shoulda/matchers'
require 'test_prof/recipes/rspec/let_it_be'
require 'test_prof/factory_default'
-require 'test_prof/factory_prof/nate_heckler'
+require 'test_prof/factory_prof/nate_heckler' if ENV.fetch('ENABLE_FACTORY_PROF', 'true') == 'true'
require 'parslet/rig/rspec'
require 'axe-rspec'
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index 969f71e4862..d07e69b1d97 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -8075,7 +8075,6 @@
- './spec/services/projects/overwrite_project_service_spec.rb'
- './spec/services/projects/participants_service_spec.rb'
- './spec/services/projects/prometheus/alerts/notify_service_spec.rb'
-- './spec/services/projects/prometheus/metrics/destroy_service_spec.rb'
- './spec/services/projects/protect_default_branch_service_spec.rb'
- './spec/services/projects/readme_renderer_service_spec.rb'
- './spec/services/projects/record_target_platforms_service_spec.rb'
diff --git a/spec/support/shared_examples/features/rich_text_editor/common_shared_examples.rb b/spec/support/shared_examples/features/rich_text_editor/common_shared_examples.rb
index 60861f774bd..7de795e5e04 100644
--- a/spec/support/shared_examples/features/rich_text_editor/common_shared_examples.rb
+++ b/spec/support/shared_examples/features/rich_text_editor/common_shared_examples.rb
@@ -49,4 +49,43 @@ RSpec.shared_examples 'rich text editor - common' do
expect(page).not_to have_text('An error occurred')
end
end
+
+ describe 'block content is added to a table' do
+ it 'converts a markdown table to HTML and shows a warning for it' do
+ click_on 'Add a table'
+
+ switch_to_content_editor
+ type_in_content_editor '* list item'
+
+ expect(page).to have_text(
+ "Tables containing block elements (like multiple paragraphs, lists or blockquotes) are not \
+supported in Markdown and will be converted to HTML."
+ )
+
+ switch_to_markdown_editor
+ expect(page.find('textarea').value).to include '
+
+| header |
+header |
+
+
+|
+
+ |
+
+
+ |
+
+
+|
+
+ |
+
+
+* list item
+ |
+
+
'
+ end
+ end
end
diff --git a/spec/support/shared_examples/features/work_items/rolledup_dates_shared_examples.rb b/spec/support/shared_examples/features/work_items/rolledup_dates_shared_examples.rb
index e19da99aea5..e3bd41cb47f 100644
--- a/spec/support/shared_examples/features/work_items/rolledup_dates_shared_examples.rb
+++ b/spec/support/shared_examples/features/work_items/rolledup_dates_shared_examples.rb
@@ -170,7 +170,7 @@ RSpec.shared_examples 'work items rolled up dates' do
context 'when updating child work item dates' do
it 'rolled up child dates' do
# https://gitlab.com/gitlab-org/gitlab/-/issues/473408
- allow(Gitlab::QueryLimiting::Transaction).to receive(:threshold).and_return(102)
+ allow(Gitlab::QueryLimiting::Transaction).to receive(:threshold).and_return(105)
child_title = 'A child issue'
add_new_child(title: child_title, start_date: '2020-12-01', due_date: '2020-12-02')
@@ -192,7 +192,7 @@ RSpec.shared_examples 'work items rolled up dates' do
context 'when removing all children' do
it 'rolled up child dates' do
# https://gitlab.com/gitlab-org/gitlab/-/issues/473408
- allow(Gitlab::QueryLimiting::Transaction).to receive(:threshold).and_return(108)
+ allow(Gitlab::QueryLimiting::Transaction).to receive(:threshold).and_return(114)
add_new_child(title: 'child issue 1', start_date: '2020-11-01', due_date: '2020-12-02')
add_new_child(title: 'child issue 2', start_date: '2020-12-01', due_date: '2021-01-02')
@@ -249,6 +249,9 @@ RSpec.shared_examples 'work items rolled up dates' do
end
it 'rolled up child dates' do
+ # https://gitlab.com/gitlab-org/gitlab/-/issues/473408
+ allow(Gitlab::QueryLimiting::Transaction).to receive(:threshold).and_return(101)
+
add_existing_child(child_work_item)
within work_item_rolledup_dates_selector do
diff --git a/spec/support/shared_examples/features/work_items_shared_examples.rb b/spec/support/shared_examples/features/work_items_shared_examples.rb
index 31bb0aed368..740144b5849 100644
--- a/spec/support/shared_examples/features/work_items_shared_examples.rb
+++ b/spec/support/shared_examples/features/work_items_shared_examples.rb
@@ -524,7 +524,7 @@ RSpec.shared_examples 'work items parent' do |type|
find_and_click_edit(work_item_parent_selector)
- find_and_click_clear(work_item_parent_selector, 'Unassign')
+ find_and_click_clear(work_item_parent_selector, 'Clear')
expect(find(work_item_parent_selector)).to have_content('None')
end
diff --git a/workhorse/go.mod b/workhorse/go.mod
index 2e4f51d8685..d3e0022b5d1 100644
--- a/workhorse/go.mod
+++ b/workhorse/go.mod
@@ -8,7 +8,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0
github.com/BurntSushi/toml v1.4.0
github.com/alecthomas/chroma/v2 v2.14.0
- github.com/aws/aws-sdk-go v1.54.18
+ github.com/aws/aws-sdk-go v1.55.2
github.com/disintegration/imaging v1.6.2
github.com/dlclark/regexp2 v1.11.2
github.com/getsentry/raven-go v0.2.0
@@ -20,12 +20,12 @@ require (
github.com/jpillora/backoff v1.0.0
github.com/mitchellh/copystructure v1.2.0
github.com/prometheus/client_golang v1.19.1-0.20240328134234-93cf5d4f5f78
- github.com/redis/go-redis/v9 v9.5.3
+ github.com/redis/go-redis/v9 v9.6.1
github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a
github.com/sirupsen/logrus v1.9.3
github.com/smartystreets/goconvey v1.8.1
github.com/stretchr/testify v1.9.0
- gitlab.com/gitlab-org/gitaly/v16 v16.11.6
+ gitlab.com/gitlab-org/gitaly/v16 v16.11.7
gitlab.com/gitlab-org/labkit v1.21.0
go.uber.org/goleak v1.3.0
gocloud.dev v0.37.0
diff --git a/workhorse/go.sum b/workhorse/go.sum
index bff7b8ef953..2aa15083bd0 100644
--- a/workhorse/go.sum
+++ b/workhorse/go.sum
@@ -96,8 +96,8 @@ github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc
github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/aws/aws-sdk-go v1.44.256/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/aws/aws-sdk-go v1.54.18 h1:t8DGtN8A2wEiazoJxeDbfPsbxCKtjoRLuO7jBSgJzo4=
-github.com/aws/aws-sdk-go v1.54.18/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
+github.com/aws/aws-sdk-go v1.55.2 h1:/2OFM8uFfK9e+cqHTw9YPrvTzIXT2XkFGXRM7WbJb7E=
+github.com/aws/aws-sdk-go v1.55.2/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/aws/aws-sdk-go-v2 v1.25.3 h1:xYiLpZTQs1mzvz5PaI6uR0Wh57ippuEthxS4iK5v0n0=
github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 h1:gTK2uhtAPtFcdRRJilZPx8uJLL2J85xK11nKtWL0wfU=
@@ -417,8 +417,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
github.com/prometheus/prometheus v0.50.1 h1:N2L+DYrxqPh4WZStU+o1p/gQlBaqFbcLBTjlp3vpdXw=
github.com/prometheus/prometheus v0.50.1/go.mod h1:FvE8dtQ1Ww63IlyKBn1V4s+zMwF9kHkVNkQBR1pM4CU=
-github.com/redis/go-redis/v9 v9.5.3 h1:fOAp1/uJG+ZtcITgZOfYFmTKPE7n4Vclj1wZFgRciUU=
-github.com/redis/go-redis/v9 v9.5.3/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4=
+github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
@@ -482,8 +482,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-gitlab.com/gitlab-org/gitaly/v16 v16.11.6 h1:4oOHqKO7/fCVrdyuONg4E6ZlX6vu3H7+YLdHQMfb1a8=
-gitlab.com/gitlab-org/gitaly/v16 v16.11.6/go.mod h1:lJizRUtXRd1SBHjNbbbL9OsGN4TiugvfRBd8bIsdWI0=
+gitlab.com/gitlab-org/gitaly/v16 v16.11.7 h1:csL3bPTHIEE0147aCo1HFgNLMgmHwlwr1Ns65OlcMuE=
+gitlab.com/gitlab-org/gitaly/v16 v16.11.7/go.mod h1:lJizRUtXRd1SBHjNbbbL9OsGN4TiugvfRBd8bIsdWI0=
gitlab.com/gitlab-org/labkit v1.21.0 h1:hLmdBDtXjD1yOmZ+uJOac3a5Tlo83QaezwhES4IYik4=
gitlab.com/gitlab-org/labkit v1.21.0/go.mod h1:zeATDAaSBelPcPLbTTq8J3ZJEHyPTLVBM1q3nva+/W4=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
diff --git a/yarn.lock b/yarn.lock
index 11017f7a76a..156e33b61f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1359,10 +1359,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.109.0.tgz#af953d8114768343034f1f02bc8e2d93eb613c65"
integrity sha512-MmBTsco2LIh/l16iJQy6R98YDOlE3C++AE0Z1+KCpAX/3+fLAmULx2sWp+JnmM0ws8J0LaeLN6+vWiPaEWA16Q==
-"@gitlab/ui@87.4.0":
- version "87.4.0"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-87.4.0.tgz#6261602c944801e0fda84d8a85199862ec327320"
- integrity sha512-Ap6i17oNrV0pgjz+AFvsStZslizCZmLyUnyxAW5JGBKA1QpvR+2pgfnBjKyrpgoHy5kmVDQoOKy84PsErT0U1g==
+"@gitlab/ui@87.6.1":
+ version "87.6.1"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-87.6.1.tgz#f6d9fad3689890d430fe179e3d58f8e75f00369e"
+ integrity sha512-5Vfl64zrJaXAeJDrPNtpv5yFygGqceucJb4Fe8RvMEiY9fbSwnwlU22BAv45b5mWEiY/C3wsURLDwNw16Xt2pg==
dependencies:
"@floating-ui/dom" "1.4.3"
echarts "^5.3.2"