Add latest changes from gitlab-org/gitlab@master

4 files changed, 17 insertions, 0 deletions

diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md
index 4d84e921acf..46d1d4c2414 100644
--- a/doc/development/contributing/issue_workflow.md
+++ b/doc/development/contributing/issue_workflow.md
@@ -81,6 +81,8 @@ already reserved for category labels).
 The descriptions on the [labels page](https://gitlab.com/groups/gitlab-org/-/labels)
 explain what falls under each type label.
 
+The GitLab handbook documents [when something is a bug and when it is a feature request.](https://about.gitlab.com/handbook/product/product-management/process/feature-or-bug.html)
+
 ### Facet labels
 
 Sometimes it's useful to refine the type of an issue. In those cases, you can
diff --git a/doc/development/event_tracking/backend.md b/doc/development/event_tracking/backend.md
new file mode 100644
index 00000000000..dc4d7279671
--- /dev/null
+++ b/doc/development/event_tracking/backend.md
@@ -0,0 +1,5 @@
+---
+redirect_to: '../../telemetry/backend.md'
+---
+
+This document was moved to [another location](../../telemetry/backend.md).
diff --git a/doc/development/event_tracking/frontend.md b/doc/development/event_tracking/frontend.md
new file mode 100644
index 00000000000..0e98daf15bb
--- /dev/null
+++ b/doc/development/event_tracking/frontend.md
@@ -0,0 +1,5 @@
+---
+redirect_to: '../../telemetry/frontend.md'
+---
+
+This document was moved to [another location](../../telemetry/frontend.md).
diff --git a/doc/development/event_tracking/index.md b/doc/development/event_tracking/index.md
new file mode 100644
index 00000000000..ae555e99c6b
--- /dev/null
+++ b/doc/development/event_tracking/index.md
@@ -0,0 +1,5 @@
+---
+redirect_to: '../../telemetry/index.md'
+---
+
+This document was moved to [another location](../../telemetry/index.md).