diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index b1c69ca6b4a..90835286de5 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -629,7 +629,7 @@ lib/gitlab/checks/** /doc/administration/operations/gitlab_sshd.md @brendan777 /doc/administration/operations/moving_repositories.md @eread /doc/administration/package_information/ @axil -/doc/administration/packages/ @marcel.amirault +/doc/administration/packages/ @lyspin /doc/administration/packages/index.md @phillipwells /doc/administration/pages/ @msedlakjakubowski /doc/administration/polling.md @axil @@ -712,11 +712,11 @@ lib/gitlab/checks/** /doc/api/cluster_agents.md @phillipwells /doc/api/code_suggestions.md @jglassman1 /doc/api/commits.md @brendan777 -/doc/api/container_registry.md @marcel.amirault +/doc/api/container_registry.md @lyspin /doc/api/custom_attributes.md @msedlakjakubowski /doc/api/dependencies.md @rdickenson @phillipwells /doc/api/dependency_list_export.md @rdickenson -/doc/api/dependency_proxy.md @marcel.amirault +/doc/api/dependency_proxy.md @lyspin /doc/api/deploy_keys.md @phillipwells /doc/api/deploy_tokens.md @phillipwells /doc/api/deployments.md @phillipwells @@ -822,7 +822,7 @@ lib/gitlab/checks/** /doc/api/project_aliases.md @brendan777 /doc/api/project_badges.md @brendan777 /doc/api/project_clusters.md @phillipwells -/doc/api/project_container_registry_protection_rules.md @marcel.amirault +/doc/api/project_container_registry_protection_rules.md @lyspin /doc/api/project_forks.md @emily.sahlani /doc/api/project_import_export.md @ashrafkhamis /doc/api/project_job_token_scopes.md @marcel.amirault @@ -903,9 +903,8 @@ lib/gitlab/checks/** /doc/ci/examples/ @lyspin /doc/ci/examples/deployment/ @phillipwells /doc/ci/examples/semantic-release.md @phillipwells -/doc/ci/gitlab_google_cloud_integration/ @marcel.amirault +/doc/ci/gitlab_google_cloud_integration/ @lyspin /doc/ci/index.md @lyspin -/doc/ci/interactive_web_terminal/ @rsarangadharan /doc/ci/jobs/ @marcel.amirault /doc/ci/jobs/job_artifacts.md @lyspin /doc/ci/jobs/job_artifacts_troubleshooting.md @lyspin @@ -1054,6 +1053,7 @@ lib/gitlab/checks/** /doc/user/application_security/secret_detection/ @rdickenson /doc/user/application_security/security_dashboard/ @rdickenson /doc/user/application_security/vulnerabilities/ @rdickenson +/doc/user/application_security/vulnerabilities/risk_assessment_data.md @rdickenson @phillipwells /doc/user/application_security/vulnerability_report/ @rdickenson /doc/user/asciidoc.md @brendan777 /doc/user/clusters/ @phillipwells @@ -1104,9 +1104,9 @@ lib/gitlab/checks/** /doc/user/operations_dashboard/ @phillipwells /doc/user/organization/ @emily.sahlani /doc/user/packages/ @phillipwells -/doc/user/packages/container_registry/ @marcel.amirault -/doc/user/packages/dependency_proxy/ @marcel.amirault -/doc/user/packages/harbor_container_registry/ @marcel.amirault +/doc/user/packages/container_registry/ @lyspin +/doc/user/packages/dependency_proxy/ @lyspin +/doc/user/packages/harbor_container_registry/ @lyspin /doc/user/profile/account/ @jglassman1 /doc/user/profile/achievements.md @emily.sahlani /doc/user/profile/comment_templates.md @aqualls @@ -1137,8 +1137,8 @@ lib/gitlab/checks/** /doc/user/project/integrations/beyond_identity.md @brendan777 /doc/user/project/integrations/git_guardian.md @brendan777 /doc/user/project/integrations/github.md @lyspin -/doc/user/project/integrations/google_artifact_management.md @marcel.amirault -/doc/user/project/integrations/harbor.md @marcel.amirault +/doc/user/project/integrations/google_artifact_management.md @lyspin +/doc/user/project/integrations/harbor.md @lyspin /doc/user/project/integrations/matrix.md @sselhorn /doc/user/project/issue_board.md @msedlakjakubowski /doc/user/project/issues/ @msedlakjakubowski diff --git a/.gitlab/ci/release-environments.gitlab-ci.yml b/.gitlab/ci/release-environments.gitlab-ci.yml index 02e3ecd62ba..6702da3e66c 100644 --- a/.gitlab/ci/release-environments.gitlab-ci.yml +++ b/.gitlab/ci/release-environments.gitlab-ci.yml @@ -1,6 +1,6 @@ --- start-release-environments-security-pipeline: - allow_failure: false + allow_failure: true extends: - .release-environments:rules:start-release-environments-security-pipeline stage: release-environments diff --git a/Gemfile b/Gemfile index f02a216a821..aae98404811 100644 --- a/Gemfile +++ b/Gemfile @@ -687,7 +687,7 @@ gem 'lockbox', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory # JSON -gem 'jsonb_accessor', '~> 1.3.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'jsonb_accessor', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'json', '~> 2.7.2', feature_category: :shared gem 'json_schemer', '~> 2.3.0', feature_category: :shared gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.checksum b/Gemfile.checksum index 572d190e17a..9b6d34d1c5f 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -348,8 +348,8 @@ {"name":"json","version":"2.7.3","platform":"ruby","checksum":"7cc3ccbfc5f83025f5524776ae8581e911772944169666988406679251932bdf"}, {"name":"json-jwt","version":"1.16.6","platform":"ruby","checksum":"ab451f9cd8743cecc4137f4170806046c1d8a6d4ee6e8570e0b5c958409b266c"}, {"name":"json_schemer","version":"2.3.0","platform":"ruby","checksum":"9f1fa173b859ca520f15e9e8d08b0892ffca80b78dd8221feb3e360ff4cdeb35"}, -{"name":"jsonb_accessor","version":"1.3.10","platform":"java","checksum":"6630ac69dac46457b03e1352178ed3e2d7ba2d8edb99f2e9b64a0e60cda9ed26"}, -{"name":"jsonb_accessor","version":"1.3.10","platform":"ruby","checksum":"670f80a257ae39e3be9233c6a8ef3b03517e06687affe510dfe61237454c58e0"}, +{"name":"jsonb_accessor","version":"1.4","platform":"java","checksum":"2c5590d33d89c7b929d5cf38ae3d2c52658bf6f84f03b06ede5c88e9d76f3451"}, +{"name":"jsonb_accessor","version":"1.4","platform":"ruby","checksum":"010e087cb843e76b6a624d68af918a8efd6b0ff2ae25b6f0acebdfea45f776ab"}, {"name":"jsonpath","version":"1.1.2","platform":"ruby","checksum":"6804124c244d04418218acb85b15c7caa79c592d7d6970195300428458946d3a"}, {"name":"jwt","version":"2.9.3","platform":"ruby","checksum":"55fd07ccdd64c622d36859748f2290fb9c119ce30b482867504e9f12654d6a65"}, {"name":"kaminari","version":"1.2.2","platform":"ruby","checksum":"c4076ff9adccc6109408333f87b5c4abbda5e39dc464bd4c66d06d9f73442a3e"}, diff --git a/Gemfile.lock b/Gemfile.lock index d9012471590..4b6116b1f09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1047,9 +1047,9 @@ GEM hana (~> 1.3) regexp_parser (~> 2.0) simpleidn (~> 0.2) - jsonb_accessor (1.3.10) - activerecord (>= 5.0) - activesupport (>= 5.0) + jsonb_accessor (1.4) + activerecord (>= 6.1) + activesupport (>= 6.1) pg (>= 0.18.1) jsonpath (1.1.2) multi_json @@ -2143,7 +2143,7 @@ DEPENDENCIES js_regex (~> 3.8) json (~> 2.7.2) json_schemer (~> 2.3.0) - jsonb_accessor (~> 1.3.10) + jsonb_accessor (~> 1.4) jwt (~> 2.9.3) kaminari (~> 1.2.2) knapsack (~> 4.0.0) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index cfdb9aa3e1a..da5add729d2 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -352,8 +352,8 @@ {"name":"json","version":"2.7.3","platform":"ruby","checksum":"7cc3ccbfc5f83025f5524776ae8581e911772944169666988406679251932bdf"}, {"name":"json-jwt","version":"1.16.6","platform":"ruby","checksum":"ab451f9cd8743cecc4137f4170806046c1d8a6d4ee6e8570e0b5c958409b266c"}, {"name":"json_schemer","version":"2.3.0","platform":"ruby","checksum":"9f1fa173b859ca520f15e9e8d08b0892ffca80b78dd8221feb3e360ff4cdeb35"}, -{"name":"jsonb_accessor","version":"1.3.10","platform":"java","checksum":"6630ac69dac46457b03e1352178ed3e2d7ba2d8edb99f2e9b64a0e60cda9ed26"}, -{"name":"jsonb_accessor","version":"1.3.10","platform":"ruby","checksum":"670f80a257ae39e3be9233c6a8ef3b03517e06687affe510dfe61237454c58e0"}, +{"name":"jsonb_accessor","version":"1.4","platform":"java","checksum":"2c5590d33d89c7b929d5cf38ae3d2c52658bf6f84f03b06ede5c88e9d76f3451"}, +{"name":"jsonb_accessor","version":"1.4","platform":"ruby","checksum":"010e087cb843e76b6a624d68af918a8efd6b0ff2ae25b6f0acebdfea45f776ab"}, {"name":"jsonpath","version":"1.1.2","platform":"ruby","checksum":"6804124c244d04418218acb85b15c7caa79c592d7d6970195300428458946d3a"}, {"name":"jwt","version":"2.9.3","platform":"ruby","checksum":"55fd07ccdd64c622d36859748f2290fb9c119ce30b482867504e9f12654d6a65"}, {"name":"kaminari","version":"1.2.2","platform":"ruby","checksum":"c4076ff9adccc6109408333f87b5c4abbda5e39dc464bd4c66d06d9f73442a3e"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index be5a505a2de..2d8babe5927 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -1061,9 +1061,9 @@ GEM hana (~> 1.3) regexp_parser (~> 2.0) simpleidn (~> 0.2) - jsonb_accessor (1.3.10) - activerecord (>= 5.0) - activesupport (>= 5.0) + jsonb_accessor (1.4) + activerecord (>= 6.1) + activesupport (>= 6.1) pg (>= 0.18.1) jsonpath (1.1.2) multi_json @@ -2170,7 +2170,7 @@ DEPENDENCIES js_regex (~> 3.8) json (~> 2.7.2) json_schemer (~> 2.3.0) - jsonb_accessor (~> 1.3.10) + jsonb_accessor (~> 1.4) jwt (~> 2.9.3) kaminari (~> 1.2.2) knapsack (~> 4.0.0) diff --git a/app/assets/javascripts/ml/model_registry/components/model_versions_table.vue b/app/assets/javascripts/ml/model_registry/components/model_versions_table.vue index 35c3a1ef0f4..744d347eed7 100644 --- a/app/assets/javascripts/ml/model_registry/components/model_versions_table.vue +++ b/app/assets/javascripts/ml/model_registry/components/model_versions_table.vue @@ -95,6 +95,7 @@ export default {