Add latest changes from gitlab-org/gitlab@master

[skip secret push protection]

Author: GitLab Bot

.gitignore

@@ -5,6 +5,7 @@
 *.rej
 .dir-locals.el
 .DS_Store
+/OpenCode.md
 .bundle
 .chef
 .directory

CHANGELOG.md

@@ -5699,7 +5699,7 @@ entry.
 - [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))
 - [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))
 - [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**
-- [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))
+- [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))
 - [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**
 - [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))
 - [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

@@ -1 +1 @@
-985f4b0e732d60fe52006b72fc2525145b1a7c52
+b91012678d66de3e7c02ff119322aa3778d04e0b

Gemfile

@@ -400,7 +400,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_c
 gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
-gem 'gitlab-labkit', '~> 1.1.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'gitlab-labkit', '~> 1.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'thrift', '~> 0.22.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # I18n

Gemfile.checksum

@@ -235,7 +235,7 @@
 {"name":"gitlab-glfm-markdown","version":"0.0.39","platform":"x86_64-linux-gnu","checksum":"90a12179eb5a9d311a840dccbab7f6d61c52fef5e526586bcfc70154016af683"},
 {"name":"gitlab-glfm-markdown","version":"0.0.39","platform":"x86_64-linux-musl","checksum":"f353114bf503e3389159e22c8af1bd12fea7016081bf60ee05b269b80793c101"},
 {"name":"gitlab-kas-grpc","version":"18.5.0.pre.rc4","platform":"ruby","checksum":"8efe8bc957572bad2ee90c22836b285eb65574591db5c8a7bc8080f69ddebcc6"},
-{"name":"gitlab-labkit","version":"1.1.3","platform":"ruby","checksum":"8980f52058f343dab04282bda473be577d9220a58c1781383b6a4369fa208acb"},
+{"name":"gitlab-labkit","version":"1.0.1","platform":"ruby","checksum":"6f354529ea9a898dc622bfd21ea4e0024dbab0d0d5a6496f0af7f3163013ecb2"},
 {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"},
 {"name":"gitlab-mail_room","version":"0.1.0","platform":"ruby","checksum":"7bf88046e980c59fccb57f873affe9d4a742f398141df20bc299715ad5587672"},
 {"name":"gitlab-markup","version":"2.0.0","platform":"ruby","checksum":"951a1c871463a8f329e6c002b2da337cd547febcc1e33d84df4a212419fba02e"},
@@ -367,6 +367,7 @@
 {"name":"json","version":"2.13.1","platform":"java","checksum":"1b46467e40628654bddd540490e8f5f5a113cdd1565ae86f14c19f6a5225c5ff"},
 {"name":"json","version":"2.13.1","platform":"ruby","checksum":"8e7cf4bb44a789ac5fc62869c7187986251c3172d9bdfa60b92c63d6ecab0ffc"},
 {"name":"json-jwt","version":"1.16.6","platform":"ruby","checksum":"ab451f9cd8743cecc4137f4170806046c1d8a6d4ee6e8570e0b5c958409b266c"},
+{"name":"json-schema","version":"5.2.2","platform":"ruby","checksum":"60beae0ed79ca9c552854c9ebfd44f50f77bd0c3144526d46afec384509940d5"},
 {"name":"json_schemer","version":"2.3.0","platform":"ruby","checksum":"9f1fa173b859ca520f15e9e8d08b0892ffca80b78dd8221feb3e360ff4cdeb35"},
 {"name":"jsonb_accessor","version":"1.4","platform":"java","checksum":"2c5590d33d89c7b929d5cf38ae3d2c52658bf6f84f03b06ede5c88e9d76f3451"},
 {"name":"jsonb_accessor","version":"1.4","platform":"ruby","checksum":"010e087cb843e76b6a624d68af918a8efd6b0ff2ae25b6f0acebdfea45f776ab"},

Gemfile.lock

@@ -769,17 +769,16 @@ GEM
       rb_sys (~> 0.9.109)
     gitlab-kas-grpc (18.5.0.pre.rc4)
       grpc (~> 1.0)
-    gitlab-labkit (1.1.3)
+    gitlab-labkit (1.0.1)
       actionpack (>= 5.0.0, < 8.1.0)
       activesupport (>= 5.0.0, < 8.1.0)
       google-protobuf (>= 3.25, < 5.0)
       grpc (>= 1.75)
       jaeger-client (~> 1.1.0)
-      json_schemer (>= 2.3.0, < 3.0)
-      openssl (~> 3.3.2)
+      json-schema (~> 5.1)
       opentracing (~> 0.4)
       pg_query (>= 6.1.0, < 7.0)
-      prometheus-client-mmap (>= 1.2, < 2.0)
+      prometheus-client-mmap (~> 1.2.9)
       redis (> 3.0.0, < 6.0.0)
     gitlab-license (2.6.0)
     gitlab-mail_room (0.1.0)
@@ -1094,6 +1093,9 @@ GEM
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
+    json-schema (5.2.2)
+      addressable (~> 2.8)
+      bigdecimal (~> 3.1)
     json_schemer (2.3.0)
       bigdecimal
       hana (~> 1.3)
@@ -2197,7 +2199,7 @@ DEPENDENCIES
   gitlab-housekeeper!
   gitlab-http!
   gitlab-kas-grpc (~> 18.5.0.pre.rc4)
-  gitlab-labkit (~> 1.1.3)
+  gitlab-labkit (~> 1.0.0)
   gitlab-license (~> 2.6)
   gitlab-mail_room (~> 0.1.0)
   gitlab-markup (~> 2.0.0)

Gemfile.next.checksum

@@ -235,7 +235,7 @@
 {"name":"gitlab-glfm-markdown","version":"0.0.39","platform":"x86_64-linux-gnu","checksum":"90a12179eb5a9d311a840dccbab7f6d61c52fef5e526586bcfc70154016af683"},
 {"name":"gitlab-glfm-markdown","version":"0.0.39","platform":"x86_64-linux-musl","checksum":"f353114bf503e3389159e22c8af1bd12fea7016081bf60ee05b269b80793c101"},
 {"name":"gitlab-kas-grpc","version":"18.5.0.pre.rc4","platform":"ruby","checksum":"8efe8bc957572bad2ee90c22836b285eb65574591db5c8a7bc8080f69ddebcc6"},
-{"name":"gitlab-labkit","version":"1.1.3","platform":"ruby","checksum":"8980f52058f343dab04282bda473be577d9220a58c1781383b6a4369fa208acb"},
+{"name":"gitlab-labkit","version":"1.0.1","platform":"ruby","checksum":"6f354529ea9a898dc622bfd21ea4e0024dbab0d0d5a6496f0af7f3163013ecb2"},
 {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"},
 {"name":"gitlab-mail_room","version":"0.1.0","platform":"ruby","checksum":"7bf88046e980c59fccb57f873affe9d4a742f398141df20bc299715ad5587672"},
 {"name":"gitlab-markup","version":"2.0.0","platform":"ruby","checksum":"951a1c871463a8f329e6c002b2da337cd547febcc1e33d84df4a212419fba02e"},
@@ -367,6 +367,7 @@
 {"name":"json","version":"2.13.1","platform":"java","checksum":"1b46467e40628654bddd540490e8f5f5a113cdd1565ae86f14c19f6a5225c5ff"},
 {"name":"json","version":"2.13.1","platform":"ruby","checksum":"8e7cf4bb44a789ac5fc62869c7187986251c3172d9bdfa60b92c63d6ecab0ffc"},
 {"name":"json-jwt","version":"1.16.6","platform":"ruby","checksum":"ab451f9cd8743cecc4137f4170806046c1d8a6d4ee6e8570e0b5c958409b266c"},
+{"name":"json-schema","version":"5.2.2","platform":"ruby","checksum":"60beae0ed79ca9c552854c9ebfd44f50f77bd0c3144526d46afec384509940d5"},
 {"name":"json_schemer","version":"2.3.0","platform":"ruby","checksum":"9f1fa173b859ca520f15e9e8d08b0892ffca80b78dd8221feb3e360ff4cdeb35"},
 {"name":"jsonb_accessor","version":"1.4","platform":"java","checksum":"2c5590d33d89c7b929d5cf38ae3d2c52658bf6f84f03b06ede5c88e9d76f3451"},
 {"name":"jsonb_accessor","version":"1.4","platform":"ruby","checksum":"010e087cb843e76b6a624d68af918a8efd6b0ff2ae25b6f0acebdfea45f776ab"},

Gemfile.next.lock

@@ -769,17 +769,16 @@ GEM
       rb_sys (~> 0.9.109)
     gitlab-kas-grpc (18.5.0.pre.rc4)
       grpc (~> 1.0)
-    gitlab-labkit (1.1.3)
+    gitlab-labkit (1.0.1)
       actionpack (>= 5.0.0, < 8.1.0)
       activesupport (>= 5.0.0, < 8.1.0)
       google-protobuf (>= 3.25, < 5.0)
       grpc (>= 1.75)
       jaeger-client (~> 1.1.0)
-      json_schemer (>= 2.3.0, < 3.0)
-      openssl (~> 3.3.2)
+      json-schema (~> 5.1)
       opentracing (~> 0.4)
       pg_query (>= 6.1.0, < 7.0)
-      prometheus-client-mmap (>= 1.2, < 2.0)
+      prometheus-client-mmap (~> 1.2.9)
       redis (> 3.0.0, < 6.0.0)
     gitlab-license (2.6.0)
     gitlab-mail_room (0.1.0)
@@ -1094,6 +1093,9 @@ GEM
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
+    json-schema (5.2.2)
+      addressable (~> 2.8)
+      bigdecimal (~> 3.1)
     json_schemer (2.3.0)
       bigdecimal
       hana (~> 1.3)
@@ -2197,7 +2199,7 @@ DEPENDENCIES
   gitlab-housekeeper!
   gitlab-http!
   gitlab-kas-grpc (~> 18.5.0.pre.rc4)
-  gitlab-labkit (~> 1.1.3)
+  gitlab-labkit (~> 1.0.0)
   gitlab-license (~> 2.6)
   gitlab-mail_room (~> 0.1.0)
   gitlab-markup (~> 2.0.0)

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

@@ -1277,25 +1277,6 @@ export default {
                 :linked-resources="workItemLinkedResources"
               />
 
-              <span
-                v-if="hasDesignWidget && !hasDesignManagementFeature"
-                class="gl-mt-5 gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-p-3 gl-text-center"
-                data-testid="design-management-disabled-message"
-              >
-                <gl-sprintf
-                  :message="
-                    s__(
-                      'DesignManagement|To upload designs, you\'ll need to enable LFS and have an admin enable hashed storage. %{linkStart}More information%{linkEnd}',
-                    )
-                  "
-                >
-                  <template #link="{ content }">
-                    <gl-link :href="$options.designManagementDocsHref">
-                      {{ content }}
-                    </gl-link>
-                  </template>
-                </gl-sprintf>
-              </span>
               <design-widget
                 v-if="hasDesignWidget"
                 :class="{ 'gl-mt-0': isDrawer }"

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

@@ -4,7 +4,9 @@ import {
   GlDisclosureDropdownItem,
   GlIcon,
   GlDisclosureDropdownGroup,
+  GlButton,
 } from '@gitlab/ui';
+import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { ROUTES } from '../constants';
 
 export default {
@@ -14,6 +16,7 @@ export default {
     GlDisclosureDropdown,
     GlDisclosureDropdownItem,
     GlDisclosureDropdownGroup,
+    GlButton,
   },
   props: {
     savedView: {
@@ -23,21 +26,15 @@ export default {
   },
   computed: {
     isViewActive() {
-      return this.$route.params.view_id === this.savedView.id;
+      const id = getIdFromGraphQLId(this.savedView.id).toString();
+      return this.$route.params.view_id === id;
+    },
+    viewLink() {
+      const id = getIdFromGraphQLId(this.savedView.id).toString();
+      return { name: ROUTES.savedView, params: { view_id: id } };
     },
   },
   methods: {
-    onViewClick() {
-      if (!this.isViewActive) {
-        this.$router
-          .push({ name: ROUTES.savedView, params: { view_id: this.savedView.id } })
-          .catch((error) => {
-            if (error.name !== 'NavigationDuplicated') {
-              throw error;
-            }
-          });
-      }
-    },
     editView() {
       // TODO: to replace this with logic to edit a view
       return '';
@@ -64,15 +61,13 @@ export default {
 </script>
 
 <template>
-  <!-- TODO: Make this a <router-link> when !isViewActive, and <gl-disclosure-dropdown> when isViewActive -->
-  <div data-testid="selector-wrapper" class="gl-cursor-pointer" @click="onViewClick">
+  <div data-testid="selector-wrapper">
     <gl-disclosure-dropdown
+      v-if="isViewActive"
       category="tertiary"
       :toggle-text="savedView.name"
       auto-close
-      :no-caret="!isViewActive"
-      class="saved-view-selector gl-pointer-events-none !gl-h-full !gl-rounded-none"
-      :class="{ 'saved-view-selector-active gl-pointer-events-auto': isViewActive }"
+      class="saved-view-selector saved-view-selector-active !gl-h-full !gl-rounded-none"
       data-testid="saved-view-selector"
     >
       <gl-disclosure-dropdown-item data-testid="edit-action" @action="editView">
@@ -116,5 +111,13 @@ export default {
         </gl-disclosure-dropdown-item>
       </gl-disclosure-dropdown-group>
     </gl-disclosure-dropdown>
+    <gl-button
+      v-else
+      category="tertiary"
+      :to="viewLink"
+      class="saved-view-selector gl-h-full !gl-rounded-none"
+    >
+      {{ savedView.name }}
+    </gl-button>
   </div>
 </template>