Add latest changes from gitlab-org/gitlab@master

42 files changed, 260 insertions, 239 deletions

diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index 42697c63252..083e422f164 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -259,6 +259,8 @@ module Issues
 
     def do_handle_issue_type_change(issue)
       SystemNoteService.change_issue_type(issue, current_user)
+
+      ::IncidentManagement::IssuableEscalationStatuses::CreateService.new(issue).execute if issue.supports_escalation?
     end
   end
 end
diff --git a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
index dc08e248c4f..3ddc5ee355a 100644
--- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: container registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
index edb282fd1a1..3de1fc2c0e8 100644
--- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
index 1e3247a7109..c11dead0b06 100644
--- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
index d465a6aff4b..bb6dd458ca6 100644
--- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
index 50df5df1b25..0e018dcd1a2 100644
--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: container registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
index cb716aae070..03e9ec5f665 100644
--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
index c1fcfd38e63..5f135e00214 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
index f8d411c0348..4912d7fd40d 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
index 9fc146d3c86..5e724cef1b7 100644
--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: container registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
index 40b86d27bca..6f190f6b4ec 100644
--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
index 59b1aef3cb6..00103711910 100644
--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
index e28f423b108..9b8ca1c5d7c 100644
--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
index 313b9b9a68e..abd37cd02d6 100644
--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: container registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
index 2d61d3fa992..29aabf7a7fa 100644
--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
index 1ccd4d89b5b..75437f7e174 100644
--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
index 5169e2d5519..976ca5febe1 100644
--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
index 580f06259a1..7f5dab5e1bc 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: redis
 distribution:
diff --git a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
index cb399d23ed1..6cf631953f6 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: redis
 distribution:
diff --git a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
index aa32883e6a5..dbd553d3ea1 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: redis
 distribution:
diff --git a/doc/development/import_project.md b/doc/development/import_project.md
index 9872aa239dc..9e236b4cfce 100644
--- a/doc/development/import_project.md
+++ b/doc/development/import_project.md
@@ -16,7 +16,7 @@ There are several ways to import a project.
 
 ### Importing via UI
 
-The first option is to simply [import the Project tarball file via the GitLab UI](../user/project/settings/import_export.md#import-the-project):
+The first option is to simply [import the Project tarball file via the GitLab UI](../user/project/settings/import_export.md#import-a-project-and-its-data):
 
 1. Create the group `qa-perf-testing`
 1. Import the [GitLab FOSS project tarball](https://gitlab.com/gitlab-org/quality/performance-data/-/blob/master/projects_export/gitlabhq_export.tar.gz) into the Group.
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index 16377443a32..2896e61b43d 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -441,6 +441,46 @@ When customizing the configuration:
   version contains the most recent changes, but may have significant changes between minor GitLab versions.
 - Only override values in the template as needed. All other values are inherited from the template.
 
+### Enforce scan execution
+
+Security and compliance teams must ensure that security scans:
+
+- Run on a regular basis for all projects.
+- Can't be disabled by developers.
+
+GitLab provides two methods of accomplishing this, each with advantages and disadvantages.
+
+- [Compliance framework pipelines](../project/settings/#compliance-pipeline-configuration)
+  are recommended when:
+
+  - Scan execution enforcement is required for SAST IaC, Container Scanning, Dependency Scanning,
+    License Compliance, API Fuzzing, or Coverage-guided Fuzzing.
+  - Scan execution enforcement of SAST or Secret Detection when customization of the default scan
+    variables is required.
+  - Scan execution enforcement is required for scanners external to GitLab.
+  - Enforced execution is required for custom jobs other than security scans.
+
+- [Scan execution policies](policies/#scan-execution-policies)
+  are recommended when:
+
+  - Scan execution enforcement is required for DAST.
+  - Scan execution enforcement is required for SAST or Secret Detection with the default scan
+    variables.
+  - Scans are required to run on a regular, scheduled cadence.
+
+Additional details about the differences between the two solutions are outlined below:
+
+| | Compliance Framework Pipelines | Scan Execution Policies |
+| ------ | ------ | ------ |
+| **Flexibility** | Supports anything that can be done in a CI file. | Limited to only the items for which GitLab has explicitly added support. DAST, SAST, and Secret Detection scans are supported. |
+| **Usability** | Requires knowledge of CI YAML. | Follows a `rules` and `actions`-based YAML structure. |
+| **Inclusion in CI pipeline** | The compliance pipeline is executed instead of the project's `gitlab-ci.yml` file. To include the project's `gitlab-ci.yml` file, use an `include` statement. Defined variables aren't allowed to be overwritten by the included project's YAML file. | Forced inclusion of a new job into the CI pipeline. DAST jobs that must be customized on a per-project basis can have project-level Site Profiles and Scan Profiles defined. To ensure separation of duties, these profiles are immutable when referenced in a scan execution policy. |
+| **Schedulable** | Can be scheduled through a scheduled pipeline on the group. | Can be scheduled natively through the policy configuration itself. |
+| **Separation of Duties** | Only group owners can create compliance framework labels. Only project owners can apply compliance framework labels to projects. The ability to make or approve changes to the compliance pipeline definition is limited to individuals who are explicitly given access to the project that contains the compliance pipeline. | Only project owners can define a linked security policy project. The ability to make or approve changes to security policies is limited to individuals who are explicitly given access to the security policy project. |
+| **Ability to apply one standard to multiple projects** | The same compliance framework label can be applied to multiple projects inside a group. | The same security policy project can be used for multiple projects across GitLab with no requirement of being located in the same group. |
+
+Feedback is welcome on our vision for [unifying the user experience for these two features](https://gitlab.com/groups/gitlab-org/-/epics/7312)
+
 ## Troubleshooting
 
 ### Secure job failing with exit code 1
diff --git a/doc/user/application_security/policies/index.md b/doc/user/application_security/policies/index.md
index e6dbd96537f..77b844c17e5 100644
--- a/doc/user/application_security/policies/index.md
+++ b/doc/user/application_security/policies/index.md
@@ -236,6 +236,18 @@ Project owners can unlink Security Policy projects from development projects. To
 the steps described in [Security Policy project selection](#security-policy-project-selection),
 but select the trash can icon in the modal.
 
+## Scan execution policies
+
+Project owners can use scan execution policies to require that security scans run on a specified
+schedule or with the project pipeline. Required scans are injected into the CI pipeline as new jobs
+with a long, random job name. In the unlikely event of a job name collision, the security policy job
+overwrites any pre-existing job in the pipeline.
+
+This feature has some overlap with [compliance framework pipelines](../../project/settings/#compliance-pipeline-configuration),
+as we have not [unified the user experience for these two features](https://gitlab.com/groups/gitlab-org/-/epics/7312).
+For details on the similarities and differences between these features, see
+[Enforce scan execution](../#enforce-scan-execution).
+
 ### Scan Execution Policy editor
 
 NOTE:
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index 8d858a282dd..01aa6ecea1e 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -70,7 +70,7 @@ To back up an entire project on GitLab.com, you can export it either:
   can also use the API to programmatically upload exports to a storage platform,
   such as Amazon S3.
 
-With exports, be aware of [what is and is not](../project/settings/import_export.md#exported-contents)
+With exports, be aware of [what is and is not](../project/settings/import_export.md#items-that-are-exported)
 included in a project export.
 
 GitLab is built on Git, so you can back up just the repository of a project by
diff --git a/doc/user/packages/generic_packages/index.md b/doc/user/packages/generic_packages/index.md
index 5b7316a495e..58b012ce656 100644
--- a/doc/user/packages/generic_packages/index.md
+++ b/doc/user/packages/generic_packages/index.md
@@ -13,9 +13,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - It's recommended for production use.
 > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-generic-packages-in-the-package-registry).
 
-WARNING:
-This feature might not be available to you. Check the **version history** note above for details.
-
 Publish generic files, like release binaries, in your project's Package Registry. Then, install the packages whenever you need to use them as a dependency.
 
 ## Authenticate to the Package Registry
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 9d7ed593d41..e4fa0723cf4 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -42,7 +42,10 @@ However, you can't import issues and merge requests this way. To retain all meta
 merge requests, use the [import/export feature](../settings/import_export.md)
 to export projects from self-managed GitLab and import those projects into GitLab.com. All GitLab
 user associations (such as comment author) are changed to the user importing the project. For more
-information, see [the import notes](../settings/import_export.md#important-notes).
+information, see the prerequisites and imporant notes in these sections:
+
+- [Export a project and its data](../settings/import_export.md#export-a-project-and-its-data).
+- [Import the project](../settings/import_export.md#import-a-project-and-its-data).
 
 NOTE:
 When migrating to GitLab.com, you must create users manually unless [SCIM](../../../user/group/saml_sso/scim_setup.md)
@@ -56,7 +59,7 @@ Migrate the assets in this order:
 1. [Projects](../../../api/projects.md)
 1. [Project variables](../../../api/project_level_variables.md)
 
-Keep in mind the limitations of the [import/export feature](../settings/import_export.md#exported-contents).
+Keep in mind the limitations of the [import/export feature](../settings/import_export.md#items-that-are-exported).
 
 You must still migrate your [Container Registry](../../packages/container_registry/)
 over a series of Docker pulls and pushes. Re-run any CI pipelines to retrieve any build artifacts.
diff --git a/doc/user/project/settings/img/import_export_download_export.png b/doc/user/project/settings/img/import_export_download_export.png
deleted file mode 100644
index 62292e99e8e..00000000000
--- a/doc/user/project/settings/img/import_export_download_export.png
+++ /dev/null
diff --git a/doc/user/project/settings/img/import_export_export_button.png b/doc/user/project/settings/img/import_export_export_button.png
deleted file mode 100644
index 6f3663d64e8..00000000000
--- a/doc/user/project/settings/img/import_export_export_button.png
+++ /dev/null
diff --git a/doc/user/project/settings/img/import_export_mail_link.png b/doc/user/project/settings/img/import_export_mail_link.png
deleted file mode 100644
index 1bd9a071178..00000000000
--- a/doc/user/project/settings/img/import_export_mail_link.png
+++ /dev/null
diff --git a/doc/user/project/settings/img/import_export_new_project.png b/doc/user/project/settings/img/import_export_new_project.png
deleted file mode 100644
index 0e2365ecb68..00000000000
--- a/doc/user/project/settings/img/import_export_new_project.png
+++ /dev/null
diff --git a/doc/user/project/settings/img/import_export_select_file.png b/doc/user/project/settings/img/import_export_select_file.png
deleted file mode 100644
index 90a3e8d5c4e..00000000000
--- a/doc/user/project/settings/img/import_export_select_file.png
+++ /dev/null
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index da0336d01ff..06bdf4ca14b 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -6,129 +6,69 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 
 # Project import/export **(FREE)**
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/3050) in GitLab 8.9.
-> - From GitLab 10.0, administrators can disable the project export option on the GitLab instance.
+Existing projects on any self-managed GitLab instance or GitLab.com can be exported to a file and
+then imported into a new GitLab instance.
 
-Existing projects running on any GitLab instance or GitLab.com can be exported with all their related
-data and be moved into a new GitLab instance.
+## Set up project import/export
 
-The **GitLab import/export** button is displayed if the project import option is enabled.
+Before you can import or export a project and its data, you must set it up.
 
-See also:
+1. On the left sidebar, select **Settings > General**.
+1. Expand **Visibility and access controls**.
+1. Scroll to **Import sources**.
+1. Enable the desired **Import sources**.
 
-- [Project import/export API](../../../api/project_import_export.md)
-- [Project import/export administration Rake tasks](../../../administration/raketasks/project_import_export.md) **(FREE SELF)**
-- [Group import/export](../../group/settings/import_export.md)
-- [Group import/export API](../../../api/group_import_export.md)
-
-To set up a project import/export:
-
-  1. On the top bar, go to **Menu > Admin > Settings > General > Visibility and access controls**.
-  1. Scroll to **Import sources**.
-  1. Enable the desired **Import sources**.
-
-## Important notes
-
-Note the following:
-
-- Before you can import a project, you must export the data first.
-  See [Export a project and its data](#export-a-project-and-its-data)
-  for how you can export a project through the UI.
-- Imports from a newer version of GitLab are not supported.
-  The Importing GitLab version must be greater than or equal to the Exporting GitLab version.
-- Imports fail unless the import and export GitLab instances are
-  compatible as described in the [Version history](#version-history).
-- Exports are generated in your configured `shared_path`, a temporary shared directory,
-  and are moved to your configured `uploads_directory`. Every 24 hours, a specific worker deletes these export files.
-- Group members are exported as project members, as long as the user has
-  a maintainer or administrator role in the group where the exported project lives.
-- Project members with the [Owner role](../../permissions.md) are imported as Maintainers.
-- Imported users can be mapped by their public email on self-managed instances, if an administrative user (not an owner) does the import.
-  The public email is not set by default. Users must [set it in their profiles](../../profile/index.md#set-your-public-email)
-  for mapping to work correctly. Additionally, the user must be an existing member of the namespace,
-  or the user can be added as a member of the project for contributions to be mapped.
-  Otherwise, a supplementary comment is left to mention that the original author and
-  the MRs, notes, or issues are owned by the importer.
-  - For project migration imports performed over GitLab.com Groups, preserving author information is
-    possible through a [professional services engagement](https://about.gitlab.com/services/migration/).
-- If an imported project contains merge requests originating from forks,
-  then new branches associated with such merge requests are created
-  in a project during the import/export. Thus, the number of branches
-  in the exported project could be bigger than in the original project.
-- Deploy keys allowed to push to protected branches are not exported. Therefore,
-  you must recreate this association by first enabling these deploy keys in your
-  imported project and then updating your protected branches accordingly.
-
-## Version history
-
-### 14.0+
-
-In GitLab 14.0, the JSON format is no longer supported for project and group exports. To allow for a
-transitional period, you can still import any JSON exports. The new format for imports and exports
-is NDJSON.
+## Between CE and EE
 
-### 13.0+
+You can export projects from the [Community Edition to the Enterprise Edition](https://about.gitlab.com/install/ce-or-ee/)
+and vice versa. This assumes [version history](#version-history)
+requirements are met.
 
-Starting with GitLab 13.0, GitLab can import bundles that were exported from a different GitLab deployment.
-This ability is limited to two previous GitLab [minor](../../../policy/maintenance.md#versioning)
-releases, which is similar to our process for [Security Releases](../../../policy/maintenance.md#security-releases).
+If you're exporting a project from the Enterprise Edition to the Community Edition, you may lose
+data that is retained only in the Enterprise Edition. For more information, see
+[downgrading from EE to CE](../../../index.md).
 
-For example:
+## Export a project and its data
 
-| Current version | Can import bundles exported from |
-|-----------------|----------------------------------|
-| 13.0            | 13.0, 12.10, 12.9                |
-| 13.1            | 13.1, 13.0, 12.10                |
+Before you can import a project, you must export it.
 
-### 12.x
+Prerequisites:
 
-Prior to 13.0 this was a defined compatibility table:
+- Review the list of [data that will be exported](#items-that-are-exported).
+  Not all data is exported.
+- You must have at least the Maintainer role for the project.
 
-| Exporting GitLab version   | Importing GitLab version   |
-| -------------------------- | -------------------------- |
-| 11.7 to 12.10              | 11.7 to 12.10              |
-| 11.1 to 11.6               | 11.1 to 11.6               |
-| 10.8 to 11.0               | 10.8 to 11.0               |
-| 10.4 to 10.7               | 10.4 to 10.7               |
-| 10.3                       | 10.3                       |
-| 10.0 to 10.2               | 10.0 to 10.2               |
-| 9.4 to 9.6                 | 9.4 to 9.6                 |
-| 9.2 to 9.3                 | 9.2 to 9.3                 |
-| 8.17 to 9.1                | 8.17 to 9.1                |
-| 8.13 to 8.16               | 8.13 to 8.16               |
-| 8.12                       | 8.12                       |
-| 8.10.3 to 8.11             | 8.10.3 to 8.11             |
-| 8.10.0 to 8.10.2           | 8.10.0 to 8.10.2           |
-| 8.9.5 to 8.9.11            | 8.9.5 to 8.9.11            |
-| 8.9.0 to 8.9.4             | 8.9.0 to 8.9.4             |
-
-Projects can be exported and imported only between versions of GitLab with matching Import/Export versions.
-
-For example, 8.10.3 and 8.11 have the same Import/Export version (0.1.3)
-and the exports between them are compatible.
-
-## Between CE and EE
+To export a project and its data, follow these steps:
 
-You can export projects from the [Community Edition to the Enterprise Edition](https://about.gitlab.com/install/ce-or-ee/) and vice versa.
-This assumes [version history](#version-history) requirements are met.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Settings**.
+1. Expand **Advanced**.
+1. Select **Export project**.
+1. After the export is generated, you should receive an email with a link to download the file.
+1. Alternatively, you can come back to the project settings and download the file from there or
+   generate a new export. After the file is available, the page should show the **Download export**
+   button.
 
-If you're exporting a project from the Enterprise Edition to the Community Edition, you may lose data that is retained only in the Enterprise Edition. For more information, see [downgrading from EE to CE](../../../index.md).
+The export is generated in your configured `shared_path`, a temporary shared directory, and then
+moved to your configured `uploads_directory`. Every 24 hours, a worker deletes these export files.
 
-## Exported contents
+### Items that are exported
 
 The following items are exported:
 
 - Project and wiki repositories
 - Project uploads
 - Project configuration, excluding integrations
-- Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, time tracking,
-  and other project entities
+- Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, time
+  tracking, and other project entities
 - Design Management files and data
 - LFS objects
 - Issue boards
 - Pipelines history
 - Push Rules
 - Awards
+- Group members are exported as project members, as long as the user has the Maintainer role in the
+  exported project's group, or is an administrator
 
 The following items are **not** exported:
 
@@ -140,6 +80,7 @@ The following items are **not** exported:
 - Any encrypted tokens
 - Merge Request Approvers
 - Repository size limits
+- Deploy keys allowed to push to protected branches
 
 These content rules also apply to creating projects from templates on the
 [group](../../group/custom_project_templates.md)
@@ -150,87 +91,146 @@ NOTE:
 For more details on the specific data persisted in a project export, see the
 [`import_export.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/import_export/project/import_export.yml) file.
 
-## Export a project and its data
-
-Full project export functionality is limited to project maintainers and owners.
-You can configure such functionality through [project settings](index.md):
-
-To export a project and its data, follow these steps:
+## Import a project and its data
 
-1. Go to your project's homepage.
+> Default maximum import file size [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/251106) from 50 MB to unlimited in GitLab 13.8.
 
-1. Select **Settings** in the sidebar.
+WARNING:
+Only import projects from sources you trust. If you import a project from an untrusted source, it
+may be possible for an attacker to steal your sensitive data.
 
-1. Scroll down and expand the **Advanced** section.
+Prerequisites:
 
-1. Scroll down to find the **Export project** button:
+- You must have [exported the project and its data](#export-a-project-and-its-data).
+- Compare GitLab versions and ensure you are importing to a GitLab version that is the same or later
+  than the GitLab version you exported to.
+- Review the [Version history](#version-history)
+  for compatibility issues.
 
-   ![Export button](img/import_export_export_button.png)
+To import a project:
 
-1. After the export is generated, you should receive an email with a link to
-   download the file:
+1. When [creating a new project](../working_with_projects.md#create-a-project),
+   select **Import project**.
+1. In **Import project from**, select **GitLab export**.
+1. Enter your project name and URL. Then select the file you exported previously.
+1. Select **Import project** to begin importing. Your newly imported project page appears shortly.
 
-   ![Email download link](img/import_export_mail_link.png)
+To get the status of an import, you can query it through the [Project import/export API](../../../api/project_import_export.md#import-status).
+As described in the API documentation, the query may return an import error or exceptions.
 
-1. Alternatively, you can come back to the project settings and download the
-   file from there, or generate a new export. After the file is available, the page
-   should show the **Download export** button:
+### Items that are imported
 
-   ![Download export](img/import_export_download_export.png)
+The following items are imported but changed slightly:
 
-## Import the project
+- Project members with the [Owner role](../../permissions.md)
+  are imported as Maintainers.
+- If an imported project contains merge requests originating from forks, then new branches
+  associated with such merge requests are created in a project during the import/export. Thus, the
+  number of branches in the exported project might be bigger than in the original project.
+- If use of the `Internal` visibility level
+  [is restricted](../../../public_access/public_access.md#restrict-use-of-public-or-internal-projects),
+  all imported projects are given `Private` visibility.
 
-> Default maximum import file size [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/251106) from 50 MB to unlimited in GitLab 13.8.
+Deploy keys aren't imported. To use deploy keys, you must enable them in your imported project and update protected branches.
 
-WARNING:
-Only import projects from sources you trust. If you import a project from an untrusted source, it
-may be possible for an attacker to steal your sensitive data.
+### Import large projects **(FREE SELF)**
 
-1. The GitLab project import feature is the first import option when creating a
-   new project. Select **GitLab export**:
+If you have a larger project, consider using a Rake task as described in the [developer documentation](../../../development/import_project.md#importing-via-a-rake-task).
 
-   ![New project](img/import_export_new_project.png)
+## Automate group and project import **(PREMIUM)**
 
-1. Enter your project name and URL. Then select the file you exported previously:
+For information on automating user, group, and project import API calls, see
+[Automate group and project import](../import/index.md#automate-group-and-project-import).
 
-   ![Select file](img/import_export_select_file.png)
+## Maximum import file size
 
-1. Select **Import project** to begin importing. Your newly imported project
-   page appears shortly.
+Administrators can set the maximum import file size one of two ways:
 
-NOTE:
-If use of the `Internal` visibility level
-[is restricted](../../../public_access/public_access.md#restrict-use-of-public-or-internal-projects),
-all imported projects are given the visibility of `Private`.
+- With the `max_import_size` option in the [Application settings API](../../../api/settings.md#change-application-settings).
+- In the [Admin Area UI](../../admin_area/settings/account_and_limit_settings.md#max-import-size).
 
-The maximum import file size can be set by the Administrator, and the default is `0` (unlimited).
-As an administrator, you can modify the maximum import file size. To do so, use the `max_import_size` option in the [Application settings API](../../../api/settings.md#change-application-settings) or the [Admin Area UI](../../admin_area/settings/account_and_limit_settings.md).
+The default is `0` (unlimited).
 
-### Project import status
+## Map users for import
 
-You can query an import through the [Project import/export API](../../../api/project_import_export.md#import-status).
-As described in the API documentation, the query may return an import error or exceptions.
+Imported users can be mapped by their public email addresses on self-managed instances, if an administrator (not an owner) does the import.
 
-### Import large projects **(FREE SELF)**
+- Public email addresses are not set by default. Users must
+[set it in their profiles](../../profile/index.md#set-your-public-email)
+for mapping to work correctly.
+- For contributions to be mapped correctly, users must be an existing member of the namespace,
+  or they can be added as a member of the project. Otherwise, a supplementary comment is left to mention that the original author and the MRs, notes, or issues that are owned by the importer.
 
-If you have a larger project, consider using a Rake task, as described in our [developer documentation](../../../development/import_project.md#importing-via-a-rake-task).
+For project migration imports performed over GitLab.com groups, preserving author information is
+possible through a [professional services engagement](https://about.gitlab.com/services/migration/).
 
 ## Rate Limits
 
 To help avoid abuse, by default, users are rate limited to:
 
-| Request Type     | Limit                                    |
-| ---------------- | ---------------------------------------- |
-| Export           | 6 projects per minute                |
-| Download export  | 1 download per group per minute  |
-| Import           | 6 projects per minute                |
+| Request Type     | Limit |
+| ---------------- | ----- |
+| Export           | 6 projects per minute |
+| Download export  | 1 download per group per minute |
+| Import           | 6 projects per minute |
 
-GitLab.com may have [different settings](../../gitlab_com/index.md#importexport) from the defaults.
+GitLab.com may have [different settings](../../gitlab_com/index.md#importexport)
+from the defaults.
 
-## Automate group and project import **(PREMIUM)**
+## Version history
 
-For information on automating user, group, and project import API calls, see
-[Automate group and project import](../import/index.md#automate-group-and-project-import).
+### 14.0+
+
+In GitLab 14.0, the JSON format is no longer supported for project and group exports. To allow for a
+transitional period, you can still import any JSON exports. The new format for imports and exports
+is NDJSON.
+
+### 13.0+
+
+Starting with GitLab 13.0, GitLab can import bundles that were exported from a different GitLab deployment.
+This ability is limited to two previous GitLab [minor](../../../policy/maintenance.md#versioning)
+releases, which is similar to our process for [Security Releases](../../../policy/maintenance.md#security-releases).
+
+For example:
+
+| Current version | Can import bundles exported from |
+|-----------------|----------------------------------|
+| 13.0            | 13.0, 12.10, 12.9                |
+| 13.1            | 13.1, 13.0, 12.10                |
+
+### 12.x
+
+Prior to 13.0 this was a defined compatibility table:
+
+| Exporting GitLab version   | Importing GitLab version   |
+| -------------------------- | -------------------------- |
+| 11.7 to 12.10              | 11.7 to 12.10              |
+| 11.1 to 11.6               | 11.1 to 11.6               |
+| 10.8 to 11.0               | 10.8 to 11.0               |
+| 10.4 to 10.7               | 10.4 to 10.7               |
+| 10.3                       | 10.3                       |
+| 10.0 to 10.2               | 10.0 to 10.2               |
+| 9.4 to 9.6                 | 9.4 to 9.6                 |
+| 9.2 to 9.3                 | 9.2 to 9.3                 |
+| 8.17 to 9.1                | 8.17 to 9.1                |
+| 8.13 to 8.16               | 8.13 to 8.16               |
+| 8.12                       | 8.12                       |
+| 8.10.3 to 8.11             | 8.10.3 to 8.11             |
+| 8.10.0 to 8.10.2           | 8.10.0 to 8.10.2           |
+| 8.9.5 to 8.9.11            | 8.9.5 to 8.9.11            |
+| 8.9.0 to 8.9.4             | 8.9.0 to 8.9.4             |
+
+Projects can be exported and imported only between versions of GitLab with matching Import/Export versions.
+
+For example, 8.10.3 and 8.11 have the same Import/Export version (0.1.3)
+and the exports between them are compatible.
+
+## Related topics
+
+- [Project import/export API](../../../api/project_import_export.md)
+- [Project import/export administration Rake tasks](../../../administration/raketasks/project_import_export.md) **(FREE SELF)**
+- [Group import/export](../../group/settings/import_export.md)
+- [Group import/export API](../../../api/group_import_export.md)
 
 ## Troubleshooting
 
@@ -245,7 +245,7 @@ Review [issue 276930](https://gitlab.com/gitlab-org/gitlab/-/issues/276930), and
 
 ### Import workarounds for large repositories
 
-[Maximum import size limitations](#import-the-project)
+[Maximum import size limitations](#import-a-project-and-its-data)
 can prevent an import from being successful. If changing the import limits is not possible, you can
 try one of the workarounds listed here.
 
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index c6cbd45a6ab..1608fda8516 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -86,12 +86,17 @@ read-only view to discourage this behavior.
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/300324) in GitLab 13.11.
 > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/331231) in GitLab 14.2.
 
-Group owners can use compliance pipeline configuration to add additional pipeline configuration to
-projects to define compliance requirements such as scans or tests.
-
-[Compliance frameworks](#compliance-frameworks) allow group owners to specify the location of
-compliance pipeline configuration stored and managed in dedicated projects, separate from regular
-projects.
+Compliance framework pipelines allow group owners to define
+a compliance pipeline in a separate repository that gets
+executed in place of the local project's `gitlab-ci.yml` file. As part of this pipeline, an
+`include` statement can reference the local project's `gitlab-ci.yml` file. This way, the two CI
+files are merged together any time the pipeline runs. Jobs and variables defined in the compliance
+pipeline can't be changed by variables in the local project's `gitlab-ci.yml` file.
+
+When used to enforce scan execution, this feature has some overlap with [scan execution policies](../../application_security/policies/#scan-execution-policies),
+as we have not [unified the user experience for these two features](https://gitlab.com/groups/gitlab-org/-/epics/7312).
+For details on the similarities and differences between these features, see
+[Enforce scan execution](../../application_security/#enforce-scan-execution).
 
 When you set up the compliance framework, use the **Compliance pipeline configuration** box to link
 the compliance framework to specific CI/CD configuration. Use the
@@ -324,7 +329,7 @@ Enable [Service Desk](../service_desk.md) for your project to offer customer sup
 
 ### Export project
 
-Learn how to [export a project](import_export.md#import-the-project) in GitLab.
+Learn how to [export a project](import_export.md#import-a-project-and-its-data) in GitLab.
 
 ### Advanced settings
 
diff --git a/lib/api/debian_project_packages.rb b/lib/api/debian_project_packages.rb
index 497ce2f4356..5fb11db8938 100644
--- a/lib/api/debian_project_packages.rb
+++ b/lib/api/debian_project_packages.rb
@@ -83,7 +83,6 @@ module API
               ::Packages::Debian::ProcessChangesWorker.perform_async(package_file.id, current_user.id) # rubocop:disable CodeReuse/Worker
             end
 
-            track_package_event('push_package', :debian, user: current_user, project: authorized_user_project, namespace: authorized_user_project.namespace)
             created!
           rescue ObjectStorage::RemoteStoreError => e
             Gitlab::ErrorTracking.track_exception(e, extra: { file_name: params[:file_name], project_id: authorized_user_project.id })
diff --git a/lib/gitlab/usage_data_counters/counter_events/package_events.yml b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
index 21d637e7152..a64d0ff7e24 100644
--- a/lib/gitlab/usage_data_counters/counter_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
@@ -5,12 +5,8 @@
 - i_package_conan_delete_package
 - i_package_conan_pull_package
 - i_package_conan_push_package
-- i_package_container_delete_package
-- i_package_container_pull_package
-- i_package_container_push_package
 - i_package_debian_delete_package
 - i_package_debian_pull_package
-- i_package_debian_push_package
 - i_package_delete_package
 - i_package_delete_package_by_deploy_token
 - i_package_delete_package_by_guest
@@ -56,9 +52,6 @@
 - i_package_rubygems_delete_package
 - i_package_rubygems_pull_package
 - i_package_rubygems_push_package
-- i_package_tag_delete_package
-- i_package_tag_pull_package
-- i_package_tag_push_package
 - i_package_terraform_module_delete_package
 - i_package_terraform_module_pull_package
 - i_package_terraform_module_push_package
diff --git a/lib/gitlab/usage_data_counters/known_events/package_events.yml b/lib/gitlab/usage_data_counters/known_events/package_events.yml
index e5031599dd0..debdbd8614f 100644
--- a/lib/gitlab/usage_data_counters/known_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml
@@ -15,22 +15,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_container_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_container_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_debian_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_debian_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_generic_deploy_token
   category: deploy_token_packages
   aggregation: weekly
@@ -39,14 +23,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_golang_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_golang_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_helm_deploy_token
   category: deploy_token_packages
   aggregation: weekly
@@ -95,14 +71,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_tag_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_tag_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_terraform_module_deploy_token
   category: deploy_token_packages
   aggregation: weekly
diff --git a/qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb b/qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb
index ace6f6c56ad..efda346b0d0 100644
--- a/qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb
+++ b/qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb
@@ -60,7 +60,7 @@ module QA
         expect(untracked_repositories).not_to include(repo1)
       end
 
-      it 'allows admin to control the number of replicas of data', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2434' do
+      it 'allows admin to control the number of replicas of data', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347566' do
         praefect_manager.track_repository_in_praefect(repo1['relative_path'], repo1['storage'], repo1['virtual_storage'])
 
         praefect_manager.set_replication_factor(repo1['relative_path'], repo1['virtual_storage'], 2)
diff --git a/spec/lib/feature_spec.rb b/spec/lib/feature_spec.rb
index 82580d5d700..77a4880bf6e 100644
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -583,7 +583,7 @@ RSpec.describe Feature, stub_feature_flags: false do
     end
 
     context 'when flag is new and not feature_flag_state_logs' do
-      let(:milestone) { "14.6" }
+      let(:milestone) { "14.9" }
 
       it { is_expected.to be_truthy }
     end
diff --git a/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
index 6f201b43390..1ac344d9250 100644
--- a/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
@@ -13,10 +13,6 @@ RSpec.describe Gitlab::UsageDataCounters::PackageEventCounter, :clean_gitlab_red
     end
   end
 
-  it 'includes the right events' do
-    expect(described_class::KNOWN_EVENTS.size).to eq 63
-  end
-
   described_class::KNOWN_EVENTS.each do |event|
     it_behaves_like 'usage counter with totals', event
   end
@@ -24,8 +20,8 @@ RSpec.describe Gitlab::UsageDataCounters::PackageEventCounter, :clean_gitlab_red
   describe '.fetch_supported_event' do
     subject { described_class.fetch_supported_event(event_name) }
 
-    let(:event_name) { 'package_events_i_package_composer_push_package' }
+    let(:event_name) { 'package_events_i_package_conan_push_package' }
 
-    it { is_expected.to eq 'i_package_composer_push_package' }
+    it { is_expected.to eq 'i_package_conan_push_package' }
   end
 end
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 875dd19b2e9..59a7182e8aa 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -204,6 +204,13 @@ RSpec.describe Issues::UpdateService, :mailer do
             expect(note).not_to eq(nil)
           end
 
+          it 'creates an escalation status' do
+            expect { update_issue(issue_type: 'incident') }
+            .to change { issue.reload.incident_management_issuable_escalation_status }
+            .from(nil)
+            .to(a_kind_of(IncidentManagement::IssuableEscalationStatus))
+          end
+
           context 'for an issue with multiple labels' do
             let(:issue) { create(:incident, project: project, labels: [label_1]) }
 
diff --git a/spec/services/packages/create_event_service_spec.rb b/spec/services/packages/create_event_service_spec.rb
index 122f1e88ad0..58fa68b11fe 100644
--- a/spec/services/packages/create_event_service_spec.rb
+++ b/spec/services/packages/create_event_service_spec.rb
@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 RSpec.describe Packages::CreateEventService do
-  let(:scope) { 'container' }
+  let(:scope) { 'generic' }
   let(:event_name) { 'push_package' }
 
   let(:params) do
@@ -75,24 +75,24 @@ RSpec.describe Packages::CreateEventService do
     context 'with a user' do
       let(:user) { create(:user) }
 
-      it_behaves_like 'db package event creation', 'user', 'container'
-      it_behaves_like 'redis package unique event creation', 'user', 'container'
-      it_behaves_like 'redis package count event creation', 'user', 'container'
+      it_behaves_like 'db package event creation', 'user', 'generic'
+      it_behaves_like 'redis package unique event creation', 'user', 'generic'
+      it_behaves_like 'redis package count event creation', 'user', 'generic'
     end
 
     context 'with a deploy token' do
       let(:user) { create(:deploy_token) }
 
-      it_behaves_like 'db package event creation', 'deploy_token', 'container'
-      it_behaves_like 'redis package unique event creation', 'deploy_token', 'container'
-      it_behaves_like 'redis package count event creation', 'deploy_token', 'container'
+      it_behaves_like 'db package event creation', 'deploy_token', 'generic'
+      it_behaves_like 'redis package unique event creation', 'deploy_token', 'generic'
+      it_behaves_like 'redis package count event creation', 'deploy_token', 'generic'
     end
 
     context 'with no user' do
       let(:user) { nil }
 
-      it_behaves_like 'db package event creation', 'guest', 'container'
-      it_behaves_like 'redis package count event creation', 'guest', 'container'
+      it_behaves_like 'db package event creation', 'guest', 'generic'
+      it_behaves_like 'redis package count event creation', 'guest', 'generic'
     end
 
     context 'with a package as scope' do
diff --git a/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb
index 2fd5e6a5f91..9f96cb2a164 100644
--- a/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb
@@ -40,7 +40,6 @@ RSpec.shared_examples 'Debian packages upload request' do |status, body = nil|
         expect(response.body).to match(body)
       end
     end
-    it_behaves_like 'a package tracking event', described_class.name, 'push_package'
   else
     it "returns #{status}#{and_body}", :aggregate_failures do
       subject