Add latest changes from gitlab-org/gitlab@master

6 files changed, 82 insertions, 9 deletions

diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index ccf1c9cbaef..0877fe510de 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -1078,6 +1078,19 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 You may want to add the `-m` flag to [remove untagged manifests and unreferenced layers](#removing-untagged-manifests-and-unreferenced-layers).
 
+### Stop garbage collection
+
+If you anticipate stopping garbage collection, you should manually run garbage collection as
+described in [Performing garbage collection without downtime](#performing-garbage-collection-without-downtime).
+You can then stop garbage collection by pressing <kbd>Control</kbd>+<kbd>C</kbd>.
+
+Otherwise, interrupting `gitlab-ctl` could leave your registry service in a down state. In this
+case, you must find the [garbage collection process](https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/master/files/gitlab-ctl-commands/registry_garbage_collect.rb#L26-35)
+itself on the system so that the `gitlab-ctl` command can bring the registry service back up again.
+
+Also, there's no way to save progress or results during the mark phase of the process. Only once
+blobs start being deleted is anything permanent done.
+
 ## Configuring GitLab and Registry to run on separate nodes (Omnibus GitLab)
 
 By default, package assumes that both services are running on the same node.
diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md
index 888b6e539d3..39c68041725 100644
--- a/doc/api/project_import_export.md
+++ b/doc/api/project_import_export.md
@@ -294,6 +294,7 @@ The `failed_relations` array is capped to 100 items.
   "path_with_namespace": "gitlab-org/gitlab-test",
   "created_at": "2017-08-29T04:36:44.383Z",
   "import_status": "started",
+  "import_type": "github",
   "correlation_id": "mezklWso3Za",
   "failed_relations": [
     {
@@ -302,8 +303,58 @@ The `failed_relations` array is capped to 100 items.
       "exception_class": "RuntimeError",
       "exception_message": "A failure occurred",
       "source": "custom error context",
-      "relation_name": "merge_requests"
+      "relation_name": "merge_requests",
+      "line_number": 0
     }
   ]
 }
 ```
+
+When importing from GitHub, the a `stats` field lists how many objects were already fetched from
+GitHub and how many were already imported:
+
+```json
+{
+  "id": 1,
+  "description": "Itaque perspiciatis minima aspernatur corporis consequatur.",
+  "name": "Gitlab Test",
+  "name_with_namespace": "Gitlab Org / Gitlab Test",
+  "path": "gitlab-test",
+  "path_with_namespace": "gitlab-org/gitlab-test",
+  "created_at": "2017-08-29T04:36:44.383Z",
+  "import_status": "started",
+  "import_type": "github",
+  "correlation_id": "mezklWso3Za",
+  "failed_relations": [
+    {
+      "id": 42,
+      "created_at": "2020-04-02T14:48:59.526Z",
+      "exception_class": "RuntimeError",
+      "exception_message": "A failure occurred",
+      "source": "custom error context",
+      "relation_name": "merge_requests",
+      "line_number": 0
+    }
+  ],
+  "stats": {
+    "fetched": {
+      "diff_note": 19,
+      "issue": 3,
+      "label": 1,
+      "note": 3,
+      "pull_request": 2,
+      "pull_request_merged_by": 1,
+      "pull_request_review": 16
+    },
+    "imported": {
+      "diff_note": 19,
+      "issue": 3,
+      "label": 1,
+      "note": 3,
+      "pull_request": 2,
+      "pull_request_merged_by": 1,
+      "pull_request_review": 16
+    }
+  }
+}
+```
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index 2753257c941..7c4a600e1fa 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -101,7 +101,7 @@ EE: true
 - _Any_ contribution from a community member, no matter how small, **may** have
   a changelog entry regardless of these guidelines if the contributor wants one.
 - Any [GLEX experiment](experiment_guide/gitlab_experiment.md) changes **should not** have a changelog entry.
-- [Removing](feature_flags/#changelog) a feature flag, when the new code is retained.
+- [Modifying](feature_flags/#changelog) a feature flag (flag removal, default-on setting).
 
 ## Writing good changelog entries
 
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 14fdbeb0307..aed1a39a2c2 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -66,6 +66,14 @@ Announced: 2021-11-22
 
 ## 15.0
 
+### API: `stale` status returned instead of `offline` or `not_connected`
+
+A breaking change will occur for the Runner [API](https://docs.gitlab.com/ee/api/runners.html#runners-api) endpoints in 15.0.
+
+Instead of the GitLab Runner API endpoints returning `offline` and `not_connected` for runners that have not contacted the GitLab instance in the past three months, the API endpoints will return the `stale` value, which was introduced in 14.6.
+
+Announced: 2021-12-22
+
 ### Audit events for repository push events
 
 Audit events for [repository events](https://docs.gitlab.com/ee/administration/audit_events.html#repository-push) are now deprecated and will be removed in GitLab 15.0.
diff --git a/doc/user/application_security/dependency_list/index.md b/doc/user/application_security/dependency_list/index.md
index 4002c184e8a..baafdcda6e0 100644
--- a/doc/user/application_security/dependency_list/index.md
+++ b/doc/user/application_security/dependency_list/index.md
@@ -7,7 +7,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Dependency list **(ULTIMATE)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/10075) in GitLab 12.0.
+> - Application dependencies [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/10075) in GitLab 12.0.
+> - System dependencies [introduced](https://gitlab.com/groups/gitlab-org/-/epics/6698) in GitLab 14.6.
 
 Use the dependency list to review your project's dependencies and key
 details about those dependencies, including their known vulnerabilities. It is a collection of dependencies in your project, including existing and new findings.
@@ -22,8 +23,9 @@ The dependency list only shows the results of the last successful pipeline to ru
 
 To view your project's dependencies, ensure you meet the following requirements:
 
-- The [Dependency Scanning](../dependency_scanning/index.md) CI job must be
-  configured for your project.
+- The [Dependency Scanning](../dependency_scanning/index.md)
+  or [Container Scanning](../container_scanning/index.md)
+  CI job must be configured for your project.
 - Your project uses at least one of the
   [languages and package managers](../dependency_scanning/index.md#supported-languages-and-package-managers)
   supported by Gemnasium.
@@ -38,7 +40,7 @@ GitLab displays dependencies with the following information:
 |-----------|-------------|
 | Component | The dependency's name and version. |
 | Packager  | The packager used to install the dependency. |
-| Location  | A link to the packager-specific lock file in your project that declared the dependency. It also shows the [dependency path](#dependency-paths) to a top-level dependency, if any, and if supported. |
+| Location  | For system dependencies, this lists the image that was scanned. For application dependencies, this shows a link to the packager-specific lock file in your project that declared the dependency. It also shows the [dependency path](#dependency-paths) to a top-level dependency, if any, and if supported. |
 | License   | Links to dependency's software licenses. |
 
 Displayed dependencies are initially sorted by the severity of their known vulnerabilities, if any. They
diff --git a/doc/user/project/clusters/protect/container_network_security/quick_start_guide.md b/doc/user/project/clusters/protect/container_network_security/quick_start_guide.md
index 283e6c0b81c..340c9397e9c 100644
--- a/doc/user/project/clusters/protect/container_network_security/quick_start_guide.md
+++ b/doc/user/project/clusters/protect/container_network_security/quick_start_guide.md
@@ -192,11 +192,10 @@ violations but don't block any traffic. To set Cilium to Blocking mode, you must
 lines to the `applications/cilium/values.yaml` file in your cluster management project:
 
 ```yaml
-config:
-  policyAuditMode: false
+policyEnforcementMode: "always"
 
 monitor:
-  eventTypes: ["drop"]
+  eventTypes: ["drop", "policy-verdict"]
 ```
 
 ### Traffic is not being allowed as expected