Skip to content

Commit 1961b46

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
[skip secret push protection]
1 parent ac17adf commit 1961b46

File tree

196 files changed

+1724
-1436
lines changed

Some content is hidden

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

196 files changed

+1724
-1436
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.rej
66
.dir-locals.el
77
.DS_Store
8+
/OpenCode.md
89
.bundle
910
.chef
1011
.directory

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5699,7 +5699,7 @@ entry.
56995699
- [Remove store_arkose_session feature flag](https://gitlab.com/gitlab-org/gitlab/-/commit/87270f6fb2b1cb00167f2967ef5731387c0aec9f) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196772))
57005700
- [Remove explore_pipeline_status feature flag](https://gitlab.com/gitlab-org/gitlab/-/commit/05628250ee8c0395f5365e6b292ad69d0bf22669) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196165))
57015701
- [Add node_modules to default dependency scanning excluded paths](https://gitlab.com/gitlab-org/gitlab/-/commit/5d5f3620c9353673b108257fee606197f24b8ed4) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/195988)) **GitLab Enterprise Edition**
5702-
- [Api#buidlUrl skipped if input is an absolute URL](https://gitlab.com/gitlab-org/gitlab/-/commit/56305277fdc7a90a527fa79d26ea31c11df909e0) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196109))
5702+
- [Api#buildUrl skipped if input is an absolute URL](https://gitlab.com/gitlab-org/gitlab/-/commit/56305277fdc7a90a527fa79d26ea31c11df909e0) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196109))
57035703
- [Cleanup use_approval_policy_rules_for_approval_rules feature](https://gitlab.com/gitlab-org/gitlab/-/commit/9835720270ec3814d226ced0539a958025b0ea38) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/191927)) **GitLab Enterprise Edition**
57045704
- [Add PG index to support code suggestions filtering](https://gitlab.com/gitlab-org/gitlab/-/commit/e7c65dde45b8a80d2fc84d8401088a107f7eefa6) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194935))
57055705
- [Finalize BBM MigrateScimIdentities](https://gitlab.com/gitlab-org/gitlab/-/commit/1a269e6a40de976fe10815ae72c475571b44a669) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/193954))

GITALY_SERVER_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
985f4b0e732d60fe52006b72fc2525145b1a7c52
1+
b91012678d66de3e7c02ff119322aa3778d04e0b

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_c
400400
gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
401401

402402
gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
403-
gem 'gitlab-labkit', '~> 1.1.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
403+
gem 'gitlab-labkit', '~> 1.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
404404
gem 'thrift', '~> 0.22.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
405405

406406
# I18n

Gemfile.checksum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
{"name":"gitlab-glfm-markdown","version":"0.0.39","platform":"x86_64-linux-gnu","checksum":"90a12179eb5a9d311a840dccbab7f6d61c52fef5e526586bcfc70154016af683"},
236236
{"name":"gitlab-glfm-markdown","version":"0.0.39","platform":"x86_64-linux-musl","checksum":"f353114bf503e3389159e22c8af1bd12fea7016081bf60ee05b269b80793c101"},
237237
{"name":"gitlab-kas-grpc","version":"18.5.0.pre.rc4","platform":"ruby","checksum":"8efe8bc957572bad2ee90c22836b285eb65574591db5c8a7bc8080f69ddebcc6"},
238-
{"name":"gitlab-labkit","version":"1.1.3","platform":"ruby","checksum":"8980f52058f343dab04282bda473be577d9220a58c1781383b6a4369fa208acb"},
238+
{"name":"gitlab-labkit","version":"1.0.1","platform":"ruby","checksum":"6f354529ea9a898dc622bfd21ea4e0024dbab0d0d5a6496f0af7f3163013ecb2"},
239239
{"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"},
240240
{"name":"gitlab-mail_room","version":"0.1.0","platform":"ruby","checksum":"7bf88046e980c59fccb57f873affe9d4a742f398141df20bc299715ad5587672"},
241241
{"name":"gitlab-markup","version":"2.0.0","platform":"ruby","checksum":"951a1c871463a8f329e6c002b2da337cd547febcc1e33d84df4a212419fba02e"},
@@ -367,6 +367,7 @@
367367
{"name":"json","version":"2.13.1","platform":"java","checksum":"1b46467e40628654bddd540490e8f5f5a113cdd1565ae86f14c19f6a5225c5ff"},
368368
{"name":"json","version":"2.13.1","platform":"ruby","checksum":"8e7cf4bb44a789ac5fc62869c7187986251c3172d9bdfa60b92c63d6ecab0ffc"},
369369
{"name":"json-jwt","version":"1.16.6","platform":"ruby","checksum":"ab451f9cd8743cecc4137f4170806046c1d8a6d4ee6e8570e0b5c958409b266c"},
370+
{"name":"json-schema","version":"5.2.2","platform":"ruby","checksum":"60beae0ed79ca9c552854c9ebfd44f50f77bd0c3144526d46afec384509940d5"},
370371
{"name":"json_schemer","version":"2.3.0","platform":"ruby","checksum":"9f1fa173b859ca520f15e9e8d08b0892ffca80b78dd8221feb3e360ff4cdeb35"},
371372
{"name":"jsonb_accessor","version":"1.4","platform":"java","checksum":"2c5590d33d89c7b929d5cf38ae3d2c52658bf6f84f03b06ede5c88e9d76f3451"},
372373
{"name":"jsonb_accessor","version":"1.4","platform":"ruby","checksum":"010e087cb843e76b6a624d68af918a8efd6b0ff2ae25b6f0acebdfea45f776ab"},

Gemfile.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -769,17 +769,16 @@ GEM
769769
rb_sys (~> 0.9.109)
770770
gitlab-kas-grpc (18.5.0.pre.rc4)
771771
grpc (~> 1.0)
772-
gitlab-labkit (1.1.3)
772+
gitlab-labkit (1.0.1)
773773
actionpack (>= 5.0.0, < 8.1.0)
774774
activesupport (>= 5.0.0, < 8.1.0)
775775
google-protobuf (>= 3.25, < 5.0)
776776
grpc (>= 1.75)
777777
jaeger-client (~> 1.1.0)
778-
json_schemer (>= 2.3.0, < 3.0)
779-
openssl (~> 3.3.2)
778+
json-schema (~> 5.1)
780779
opentracing (~> 0.4)
781780
pg_query (>= 6.1.0, < 7.0)
782-
prometheus-client-mmap (>= 1.2, < 2.0)
781+
prometheus-client-mmap (~> 1.2.9)
783782
redis (> 3.0.0, < 6.0.0)
784783
gitlab-license (2.6.0)
785784
gitlab-mail_room (0.1.0)
@@ -1094,6 +1093,9 @@ GEM
10941093
bindata
10951094
faraday (~> 2.0)
10961095
faraday-follow_redirects
1096+
json-schema (5.2.2)
1097+
addressable (~> 2.8)
1098+
bigdecimal (~> 3.1)
10971099
json_schemer (2.3.0)
10981100
bigdecimal
10991101
hana (~> 1.3)
@@ -2197,7 +2199,7 @@ DEPENDENCIES
21972199
gitlab-housekeeper!
21982200
gitlab-http!
21992201
gitlab-kas-grpc (~> 18.5.0.pre.rc4)
2200-
gitlab-labkit (~> 1.1.3)
2202+
gitlab-labkit (~> 1.0.0)
22012203
gitlab-license (~> 2.6)
22022204
gitlab-mail_room (~> 0.1.0)
22032205
gitlab-markup (~> 2.0.0)

Gemfile.next.checksum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
{"name":"gitlab-glfm-markdown","version":"0.0.39","platform":"x86_64-linux-gnu","checksum":"90a12179eb5a9d311a840dccbab7f6d61c52fef5e526586bcfc70154016af683"},
236236
{"name":"gitlab-glfm-markdown","version":"0.0.39","platform":"x86_64-linux-musl","checksum":"f353114bf503e3389159e22c8af1bd12fea7016081bf60ee05b269b80793c101"},
237237
{"name":"gitlab-kas-grpc","version":"18.5.0.pre.rc4","platform":"ruby","checksum":"8efe8bc957572bad2ee90c22836b285eb65574591db5c8a7bc8080f69ddebcc6"},
238-
{"name":"gitlab-labkit","version":"1.1.3","platform":"ruby","checksum":"8980f52058f343dab04282bda473be577d9220a58c1781383b6a4369fa208acb"},
238+
{"name":"gitlab-labkit","version":"1.0.1","platform":"ruby","checksum":"6f354529ea9a898dc622bfd21ea4e0024dbab0d0d5a6496f0af7f3163013ecb2"},
239239
{"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"},
240240
{"name":"gitlab-mail_room","version":"0.1.0","platform":"ruby","checksum":"7bf88046e980c59fccb57f873affe9d4a742f398141df20bc299715ad5587672"},
241241
{"name":"gitlab-markup","version":"2.0.0","platform":"ruby","checksum":"951a1c871463a8f329e6c002b2da337cd547febcc1e33d84df4a212419fba02e"},
@@ -367,6 +367,7 @@
367367
{"name":"json","version":"2.13.1","platform":"java","checksum":"1b46467e40628654bddd540490e8f5f5a113cdd1565ae86f14c19f6a5225c5ff"},
368368
{"name":"json","version":"2.13.1","platform":"ruby","checksum":"8e7cf4bb44a789ac5fc62869c7187986251c3172d9bdfa60b92c63d6ecab0ffc"},
369369
{"name":"json-jwt","version":"1.16.6","platform":"ruby","checksum":"ab451f9cd8743cecc4137f4170806046c1d8a6d4ee6e8570e0b5c958409b266c"},
370+
{"name":"json-schema","version":"5.2.2","platform":"ruby","checksum":"60beae0ed79ca9c552854c9ebfd44f50f77bd0c3144526d46afec384509940d5"},
370371
{"name":"json_schemer","version":"2.3.0","platform":"ruby","checksum":"9f1fa173b859ca520f15e9e8d08b0892ffca80b78dd8221feb3e360ff4cdeb35"},
371372
{"name":"jsonb_accessor","version":"1.4","platform":"java","checksum":"2c5590d33d89c7b929d5cf38ae3d2c52658bf6f84f03b06ede5c88e9d76f3451"},
372373
{"name":"jsonb_accessor","version":"1.4","platform":"ruby","checksum":"010e087cb843e76b6a624d68af918a8efd6b0ff2ae25b6f0acebdfea45f776ab"},

Gemfile.next.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -769,17 +769,16 @@ GEM
769769
rb_sys (~> 0.9.109)
770770
gitlab-kas-grpc (18.5.0.pre.rc4)
771771
grpc (~> 1.0)
772-
gitlab-labkit (1.1.3)
772+
gitlab-labkit (1.0.1)
773773
actionpack (>= 5.0.0, < 8.1.0)
774774
activesupport (>= 5.0.0, < 8.1.0)
775775
google-protobuf (>= 3.25, < 5.0)
776776
grpc (>= 1.75)
777777
jaeger-client (~> 1.1.0)
778-
json_schemer (>= 2.3.0, < 3.0)
779-
openssl (~> 3.3.2)
778+
json-schema (~> 5.1)
780779
opentracing (~> 0.4)
781780
pg_query (>= 6.1.0, < 7.0)
782-
prometheus-client-mmap (>= 1.2, < 2.0)
781+
prometheus-client-mmap (~> 1.2.9)
783782
redis (> 3.0.0, < 6.0.0)
784783
gitlab-license (2.6.0)
785784
gitlab-mail_room (0.1.0)
@@ -1094,6 +1093,9 @@ GEM
10941093
bindata
10951094
faraday (~> 2.0)
10961095
faraday-follow_redirects
1096+
json-schema (5.2.2)
1097+
addressable (~> 2.8)
1098+
bigdecimal (~> 3.1)
10971099
json_schemer (2.3.0)
10981100
bigdecimal
10991101
hana (~> 1.3)
@@ -2197,7 +2199,7 @@ DEPENDENCIES
21972199
gitlab-housekeeper!
21982200
gitlab-http!
21992201
gitlab-kas-grpc (~> 18.5.0.pre.rc4)
2200-
gitlab-labkit (~> 1.1.3)
2202+
gitlab-labkit (~> 1.0.0)
22012203
gitlab-license (~> 2.6)
22022204
gitlab-mail_room (~> 0.1.0)
22032205
gitlab-markup (~> 2.0.0)

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,25 +1277,6 @@ export default {
12771277
:linked-resources="workItemLinkedResources"
12781278
/>
12791279
1280-
<span
1281-
v-if="hasDesignWidget && !hasDesignManagementFeature"
1282-
class="gl-mt-5 gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-p-3 gl-text-center"
1283-
data-testid="design-management-disabled-message"
1284-
>
1285-
<gl-sprintf
1286-
:message="
1287-
s__(
1288-
'DesignManagement|To upload designs, you\'ll need to enable LFS and have an admin enable hashed storage. %{linkStart}More information%{linkEnd}',
1289-
)
1290-
"
1291-
>
1292-
<template #link="{ content }">
1293-
<gl-link :href="$options.designManagementDocsHref">
1294-
{{ content }}
1295-
</gl-link>
1296-
</template>
1297-
</gl-sprintf>
1298-
</span>
12991280
<design-widget
13001281
v-if="hasDesignWidget"
13011282
:class="{ 'gl-mt-0': isDrawer }"

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import {
44
GlDisclosureDropdownItem,
55
GlIcon,
66
GlDisclosureDropdownGroup,
7+
GlButton,
78
} from '@gitlab/ui';
9+
import { getIdFromGraphQLId } from '~/graphql_shared/utils';
810
import { ROUTES } from '../constants';
911
1012
export default {
@@ -14,6 +16,7 @@ export default {
1416
GlDisclosureDropdown,
1517
GlDisclosureDropdownItem,
1618
GlDisclosureDropdownGroup,
19+
GlButton,
1720
},
1821
props: {
1922
savedView: {
@@ -23,21 +26,15 @@ export default {
2326
},
2427
computed: {
2528
isViewActive() {
26-
return this.$route.params.view_id === this.savedView.id;
29+
const id = getIdFromGraphQLId(this.savedView.id).toString();
30+
return this.$route.params.view_id === id;
31+
},
32+
viewLink() {
33+
const id = getIdFromGraphQLId(this.savedView.id).toString();
34+
return { name: ROUTES.savedView, params: { view_id: id } };
2735
},
2836
},
2937
methods: {
30-
onViewClick() {
31-
if (!this.isViewActive) {
32-
this.$router
33-
.push({ name: ROUTES.savedView, params: { view_id: this.savedView.id } })
34-
.catch((error) => {
35-
if (error.name !== 'NavigationDuplicated') {
36-
throw error;
37-
}
38-
});
39-
}
40-
},
4138
editView() {
4239
// TODO: to replace this with logic to edit a view
4340
return '';
@@ -64,15 +61,13 @@ export default {
6461
</script>
6562

6663
<template>
67-
<!-- TODO: Make this a <router-link> when !isViewActive, and <gl-disclosure-dropdown> when isViewActive -->
68-
<div data-testid="selector-wrapper" class="gl-cursor-pointer" @click="onViewClick">
64+
<div data-testid="selector-wrapper">
6965
<gl-disclosure-dropdown
66+
v-if="isViewActive"
7067
category="tertiary"
7168
:toggle-text="savedView.name"
7269
auto-close
73-
:no-caret="!isViewActive"
74-
class="saved-view-selector gl-pointer-events-none !gl-h-full !gl-rounded-none"
75-
:class="{ 'saved-view-selector-active gl-pointer-events-auto': isViewActive }"
70+
class="saved-view-selector saved-view-selector-active !gl-h-full !gl-rounded-none"
7671
data-testid="saved-view-selector"
7772
>
7873
<gl-disclosure-dropdown-item data-testid="edit-action" @action="editView">
@@ -116,5 +111,13 @@ export default {
116111
</gl-disclosure-dropdown-item>
117112
</gl-disclosure-dropdown-group>
118113
</gl-disclosure-dropdown>
114+
<gl-button
115+
v-else
116+
category="tertiary"
117+
:to="viewLink"
118+
class="saved-view-selector gl-h-full !gl-rounded-none"
119+
>
120+
{{ savedView.name }}
121+
</gl-button>
119122
</div>
120123
</template>

0 commit comments

Comments
 (0)