Skip to content

Commit df4287f

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 6330dc4 commit df4287f

File tree

5 files changed

+16
-27
lines changed

5 files changed

+16
-27
lines changed

GITLAB_KAS_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
82d009755f8dff37a144d63220fdf70c1643c166
1+
02ff05833da52a69f4c16fa94e539c6f3ab306ea

app/assets/javascripts/work_items/components/create_work_item.vue

+7-20
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { clearDraft } from '~/lib/utils/autosave';
1616
import { isMetaEnterKeyPair } from '~/lib/utils/common_utils';
1717
import { getParameterByName } from '~/lib/utils/url_utility';
1818
import { convertToGraphQLId } from '~/graphql_shared/utils';
19-
import { fetchPolicies } from '~/lib/graphql';
2019
import { s__, sprintf } from '~/locale';
2120
import * as Sentry from '~/sentry/sentry_browser_wrapper';
2221
import { addHierarchyChild, setNewWorkItemCache } from '~/work_items/graphql/cache_utils';
@@ -193,9 +192,9 @@ export default {
193192
data() {
194193
return {
195194
isTitleValid: true,
196-
workItemTitle: this.title || '',
197195
isConfidential: false,
198196
isRelatedToItem: true,
197+
localTitle: this.title || '',
199198
error: null,
200199
workItemTypes: [],
201200
selectedProjectFullPath: this.initialSelectedProject(),
@@ -225,11 +224,6 @@ export default {
225224
return this.skipWorkItemQuery;
226225
},
227226
update(data) {
228-
const title = data?.workspace?.workItem?.title;
229-
230-
if (this.isTitleFilled(title)) {
231-
this.updateTitle(title);
232-
}
233227
return data?.workspace?.workItem ?? {};
234228
},
235229
result() {
@@ -243,9 +237,6 @@ export default {
243237
query() {
244238
return namespaceWorkItemTypesQuery;
245239
},
246-
fetchPolicy() {
247-
return this.workItemTypeName ? fetchPolicies.CACHE_ONLY : fetchPolicies.CACHE_FIRST;
248-
},
249240
variables() {
250241
return {
251242
fullPath: this.selectedProjectFullPath,
@@ -460,6 +451,9 @@ export default {
460451
const healthStatusWidget = findWidget(WIDGET_TYPE_HEALTH_STATUS, this.workItem);
461452
return healthStatusWidget?.healthStatus || null;
462453
},
454+
workItemTitle() {
455+
return this.localTitle || this.workItem?.title || this.title;
456+
},
463457
workItemDescription() {
464458
const descriptionWidget = findWidget(WIDGET_TYPE_DESCRIPTION, this.workItem);
465459
return descriptionWidget?.description || this.description;
@@ -576,13 +570,6 @@ export default {
576570
this.createWorkItem();
577571
}
578572
},
579-
isTitleFilled(newValue) {
580-
const title = newValue ?? this.workItemTitle;
581-
return Boolean(String(title).trim());
582-
},
583-
updateTitle(newValue) {
584-
this.workItemTitle = newValue;
585-
},
586573
validateAllowedParentTypes(selectedWorkItemType) {
587574
return (
588575
this.workItemTypes
@@ -596,8 +583,8 @@ export default {
596583
this.selectedWorkItemType?.widgetDefinitions?.flatMap((i) => i.type) || [];
597584
return widgetDefinitions.indexOf(widgetType) !== -1;
598585
},
599-
validate(newValue) {
600-
this.isTitleValid = this.isTitleFilled(newValue);
586+
validate() {
587+
this.isTitleValid = Boolean(String(this.workItemTitle).trim());
601588
},
602589
setNumberOfDiscussionsResolved() {
603590
if (this.discussionToResolve || this.mergeRequestToResolveDiscussionsOf) {
@@ -607,7 +594,7 @@ export default {
607594
},
608595
async updateDraftData(type, value) {
609596
if (type === 'title') {
610-
this.workItemTitle = value;
597+
this.localTitle = value;
611598
}
612599
613600
try {

app/models/ci/job_token/allowlist_migration_task.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ def migrate!
5151
project_id_chunks = project_ids.each_slice(chunk_size).to_a
5252

5353
Parallel.each(project_id_chunks, in_threads: @concurrency) do |project_id_chunk|
54-
migrate_batch(project_id_chunk)
54+
ApplicationRecord.connection_pool.with_connection do
55+
migrate_batch(project_id_chunk)
56+
end
5557
end
5658
end
5759
end

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
"swagger-cli": "^4.0.4",
306306
"tailwindcss": "^3.4.1",
307307
"timezone-mock": "^1.0.8",
308-
"vite": "^6.3.3",
308+
"vite": "^6.3.4",
309309
"vite-plugin-ruby": "^5.1.1",
310310
"vue-loader-vue3": "npm:[email protected]",
311311
"vue-test-utils-compat": "0.0.14",

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -15029,10 +15029,10 @@ vite-plugin-ruby@^5.1.1:
1502915029
debug "^4.3.4"
1503015030
fast-glob "^3.3.2"
1503115031

15032-
vite@^6.3.3:
15033-
version "6.3.3"
15034-
resolved "https://registry.yarnpkg.com/vite/-/vite-6.3.3.tgz#497392c3f2243194e4dbf09ea83e9a3dddf49b88"
15035-
integrity sha512-5nXH+QsELbFKhsEfWLkHrvgRpTdGJzqOZ+utSdmPTvwHmvU6ITTm3xx+mRusihkcI8GeC7lCDyn3kDtiki9scw==
15032+
vite@^6.3.4:
15033+
version "6.3.4"
15034+
resolved "https://registry.yarnpkg.com/vite/-/vite-6.3.4.tgz#d441a72c7cd9a93b719bb851250a4e6c119c9cff"
15035+
integrity sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==
1503615036
dependencies:
1503715037
esbuild "^0.25.0"
1503815038
fdir "^6.4.4"

0 commit comments

Comments
 (0)