Add latest changes from gitlab-org/gitlab@master

6 files changed, 11 insertions, 106 deletions

diff --git a/config/events/1656555050_issues_edit_g_project_management_issue_changed_epic.yml b/config/events/1656555050_issues_edit_g_project_management_issue_changed_epic.yml
deleted file mode 100644
index b74054b4eb5..00000000000
--- a/config/events/1656555050_issues_edit_g_project_management_issue_changed_epic.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-description: Epic was changed on an issue
-category: issues_edit
-action: g_project_management_issue_changed_epic
-identifiers:
-  - project
-  - user
-  - namespace
-product_section: dev
-product_stage: plan
-product_group: project_management
-product_category: issue_tracking
-milestone: "15.2"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
-distributions:
-  - ee
-tiers:
-  - premium
-  - ultimate
-
diff --git a/config/events/1656555163_issues_edit_g_project_management_issue_health_status_changed.yml b/config/events/1656555163_issues_edit_g_project_management_issue_health_status_changed.yml
deleted file mode 100644
index 00a375074f6..00000000000
--- a/config/events/1656555163_issues_edit_g_project_management_issue_health_status_changed.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-description: Health status was changed on an issue
-category: issues_edit
-action: g_project_management_issue_health_status_changed
-identifiers:
-  - project
-  - user
-  - namespace
-product_section: dev
-product_stage: plan
-product_group: project_management
-product_category: issue_tracking
-milestone: "15.2"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
-distributions:
-  - ee
-tiers:
-  - premium
-  - ultimate
-
diff --git a/config/events/1656555272_issues_edit_g_project_management_issue_iteration_changed.yml b/config/events/1656555272_issues_edit_g_project_management_issue_iteration_changed.yml
deleted file mode 100644
index 7e755c6e0e9..00000000000
--- a/config/events/1656555272_issues_edit_g_project_management_issue_iteration_changed.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-description: Issue's iteration was changed
-category: issues_edit
-action: g_project_management_issue_iteration_changed
-identifiers:
-  - project
-  - user
-  - namespace
-product_section: dev
-product_stage: plan
-product_group: project_management
-product_category: issue_tracking
-milestone: "15.2"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
-distributions:
-  - ee
-tiers:
-  - premium
-  - ultimate
-
diff --git a/config/events/1656555342_issues_edit_g_project_management_issue_removed_from_epic.yml b/config/events/1656555342_issues_edit_g_project_management_issue_removed_from_epic.yml
deleted file mode 100644
index 5241e48ee9f..00000000000
--- a/config/events/1656555342_issues_edit_g_project_management_issue_removed_from_epic.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-description: An issue was removed from an epic
-category: issues_edit
-action: g_project_management_issue_removed_from_epic
-identifiers:
-  - project
-  - user
-  - namespace
-product_section: dev
-product_stage: plan
-product_group: project_management
-product_category: issue_tracking
-milestone: "15.2"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
-distributions:
-  - ee
-tiers:
-  - premium
-  - ultimate
-
diff --git a/config/events/1656555426_issues_edit_g_project_management_issue_weight_changed.yml b/config/events/1656555426_issues_edit_g_project_management_issue_weight_changed.yml
deleted file mode 100644
index 99492d50176..00000000000
--- a/config/events/1656555426_issues_edit_g_project_management_issue_weight_changed.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-description: Issue's weight was changed
-category: issues_edit
-action: g_project_management_issue_weight_changed
-identifiers:
-  - project
-  - user
-  - namespace
-product_section: dev
-product_stage: plan
-product_group: project_management
-product_category: issue_tracking
-milestone: "15.2"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
-distributions:
-  - ee
-tiers:
-  - premium
-  - ultimate
-
diff --git a/config/events/1656554755_issues_edit_g_project_management_issue_added_to_epic.yml b/config/events/1659067369_issue_actions_perform_issue_acitons_.yml
index 0c1ea4584e1..77fabfa2d6a 100644
--- a/config/events/1656554755_issues_edit_g_project_management_issue_added_to_epic.yml
+++ b/config/events/1659067369_issue_actions_perform_issue_acitons_.yml
@@ -1,20 +1,25 @@
 ---
-description: Issue was added to an epic
+description: Issue usage event
 category: issues_edit
-action: g_project_management_issue_added_to_epic
+action: perform_issue_action
+label_description:
+property_description: the name of the performed action
+value_description:
+extra_properties:
 identifiers:
+  - namespace
   - project
   - user
-  - namespace
 product_section: dev
 product_stage: plan
 product_group: project_management
 product_category: issue_tracking
-milestone: "15.2"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91443
+milestone: "15.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91659
 distributions:
+  - ce
   - ee
 tiers:
+  - free
   - premium
   - ultimate
-