From 2edf97e22f7b885e5e0311f7a22abc1992fc68c2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Jan 2025 15:35:56 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITLAB_PAGES_VERSION | 2 +- app/assets/javascripts/api.js | 7 -- app/assets/javascripts/api/packages_api.js | 7 ++ .../index/components/mlflow_usage_modal.vue | 13 ++++ .../dependency_proxy/app.vue | 9 ++- app/models/namespace.rb | 16 +---- .../require_organization.yml | 9 --- ...vulnerability_user_mentions_project_id.yml | 5 +- ..._vulnerability_user_mentions_project_id.rb | 21 ++++++ db/schema_migrations/20250107134154 | 1 + ...ported_models_and_hardware_requirements.md | 29 +++++--- .../policies/pipeline_execution_policies.md | 10 ++- .../vulnerability_management_policy.md | 8 +-- doc/user/gitlab_duo_chat/index.md | 3 + spec/frontend/api/packages_api_spec.js | 16 ++++- spec/frontend/api_spec.js | 13 ---- .../components/mlflow_usage_modal_spec.js | 48 +++++++++---- spec/models/namespace_spec.rb | 68 ------------------- 18 files changed, 135 insertions(+), 150 deletions(-) delete mode 100644 config/feature_flags/gitlab_com_derisk/require_organization.yml create mode 100644 db/post_migrate/20250107134154_finalize_backfill_vulnerability_user_mentions_project_id.rb create mode 100644 db/schema_migrations/20250107134154 diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index c8092123fd9..0439dd77735 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -916824d9cf035ed16cbd91364188745bd1602771 +45d5c77a77939f051b23b2052bb171d6314bb8e5 diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 471cb4fd4fd..3db93a8ad59 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -99,7 +99,6 @@ const Api = { deployKeysPath: '/api/:version/deploy_keys', secureFilePath: '/api/:version/projects/:project_id/secure_files/:secure_file_id', secureFilesPath: '/api/:version/projects/:project_id/secure_files', - dependencyProxyPath: '/api/:version/groups/:id/dependency_proxy/cache', markdownPath: '/api/:version/markdown', group(groupId, callback = () => {}) { @@ -1066,12 +1065,6 @@ const Api = { return result; }, - deleteDependencyProxyCacheList(groupId, options = {}) { - const url = Api.buildUrl(this.dependencyProxyPath).replace(':id', groupId); - - return axios.delete(url, { params: { ...options } }); - }, - markdown(data = {}) { const url = Api.buildUrl(this.markdownPath); diff --git a/app/assets/javascripts/api/packages_api.js b/app/assets/javascripts/api/packages_api.js index 138843a910a..5094c574976 100644 --- a/app/assets/javascripts/api/packages_api.js +++ b/app/assets/javascripts/api/packages_api.js @@ -1,6 +1,7 @@ import axios from '../lib/utils/axios_utils'; import { buildApiUrl } from './api_utils'; +const DEPENDENCY_PROXY_CACHE_PATH = '/api/:version/groups/:id/dependency_proxy/cache'; const PUBLISH_PACKAGE_PATH = '/api/:version/projects/:id/packages/generic/:package_name/:package_version/:file_name'; @@ -24,3 +25,9 @@ export function publishPackage( ...axiosOptions, }); } + +export function deleteDependencyProxyCacheList(groupId, options = {}) { + const url = buildApiUrl(DEPENDENCY_PROXY_CACHE_PATH).replace(':id', groupId); + + return axios.delete(url, { params: { ...options } }); +} diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/components/mlflow_usage_modal.vue b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/components/mlflow_usage_modal.vue index 512d7f38b15..42caae74571 100644 --- a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/components/mlflow_usage_modal.vue +++ b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/components/mlflow_usage_modal.vue @@ -1,6 +1,7 @@