From e4503e5d77801ed455f23e9ef3e10ead4a45bf5e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 2 Feb 2022 00:18:16 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../Feature proposal - detailed.md | 7 +- .../javascripts/boards/stores/actions.js | 2 - .../components/blob_content_viewer.vue | 2 +- .../components/blob_viewers/simple_viewer.vue | 4 +- .../vue_shared/components/source_viewer.vue | 4 +- app/models/container_repository.rb | 15 +- .../disable_metric_dashboard_refresh_rate.yml | 2 +- .../development/incident_escalations.yml | 2 +- ...trics_dashboard_exhaustive_validations.yml | 2 +- .../prometheus_computed_alerts.yml | 2 +- .../development/rearrange_pipelines_table.yml | 2 +- ...settings_operations_prometheus_service.yml | 2 +- ...nt_management_oncall_notification_sent.yml | 2 +- .../ops/prometheus_notify_max_alerts.yml | 2 +- .../004_zeitwerk.rb | 1 + doc/administration/pages/index.md | 17 +- doc/ci/runners/saas/windows_saas_runner.md | 2 +- doc/development/internal_api/index.md | 10 +- .../settings/external_authorization.md | 2 +- .../classification_label_on_project_page.png | Bin 19568 -> 0 bytes ...sification_label_on_project_page_v14_8.png | Bin 0 -> 17728 bytes .../test_coverage_visualization.md | 27 ++++ lib/api/api.rb | 1 + lib/api/helpers/container_registry_helpers.rb | 2 +- .../internal/container_registry/migration.rb | 63 ++++++++ .../security/validators/schemas/14.0.0 | 1 + .../security/validators/schemas/14.0.1 | 1 + .../security/validators/schemas/14.0.2 | 1 + .../security/validators/schemas/14.0.3 | 1 + .../security/validators/schemas/14.0.4 | 1 + .../security/validators/schemas/14.0.5 | 1 + .../security/validators/schemas/14.0.6 | 1 + .../security/validators/schemas/14.1.0 | 1 + spec/frontend/boards/stores/actions_spec.js | 4 +- .../__snapshots__/simple_viewer_spec.js.snap | 4 +- spec/models/container_repository_spec.rb | 39 +++++ .../container_registry/migration_spec.rb | 153 ++++++++++++++++++ 37 files changed, 357 insertions(+), 26 deletions(-) delete mode 100644 doc/user/admin_area/settings/img/classification_label_on_project_page.png create mode 100644 doc/user/admin_area/settings/img/classification_label_on_project_page_v14_8.png create mode 100644 lib/api/internal/container_registry/migration.rb create mode 120000 lib/gitlab/ci/parsers/security/validators/schemas/14.0.0 create mode 120000 lib/gitlab/ci/parsers/security/validators/schemas/14.0.1 create mode 120000 lib/gitlab/ci/parsers/security/validators/schemas/14.0.2 create mode 120000 lib/gitlab/ci/parsers/security/validators/schemas/14.0.3 create mode 120000 lib/gitlab/ci/parsers/security/validators/schemas/14.0.4 create mode 120000 lib/gitlab/ci/parsers/security/validators/schemas/14.0.5 create mode 120000 lib/gitlab/ci/parsers/security/validators/schemas/14.0.6 create mode 120000 lib/gitlab/ci/parsers/security/validators/schemas/14.1.0 create mode 100644 spec/requests/api/internal/container_registry/migration_spec.rb diff --git a/.gitlab/issue_templates/Feature proposal - detailed.md b/.gitlab/issue_templates/Feature proposal - detailed.md index f7d0567f806..862c0e03258 100644 --- a/.gitlab/issue_templates/Feature proposal - detailed.md +++ b/.gitlab/issue_templates/Feature proposal - detailed.md @@ -63,7 +63,12 @@ Consider adding checkboxes and expectations of users with certain levels of memb * [ ] Add expected impact to Reporter (20) members * [ ] Add expected impact to Developer (30) members * [ ] Add expected impact to Maintainer (40) members -* [ ] Add expected impact to Owner (50) members --> +* [ ] Add expected impact to Owner (50) members + +Please consider performing a threat model for the code changes that are introduced as part of this feature. To get started, refer to our Threat Modeling handbook page https://about.gitlab.com/handbook/security/threat_modeling/#threat-modeling. + +Don't hesitate to reach out to the Application Security Team (`@gitlab-com/gl-security/appsec`) to discuss any security concerns. +--> ### Documentation diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js index 48ca3239cfd..1ebfcfc331b 100644 --- a/app/assets/javascripts/boards/stores/actions.js +++ b/app/assets/javascripts/boards/stores/actions.js @@ -15,7 +15,6 @@ import { FilterFields, ListTypeTitles, DraggableItemTypes, - active, } from 'ee_else_ce/boards/constants'; import { formatIssueInput, @@ -210,7 +209,6 @@ export default { const variables = { fullPath, searchTerm, - state: active, }; let query; diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index 547e41019a2..ca89e549181 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -245,7 +245,7 @@ export default {