Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

4 files changed, 105 insertions, 0 deletions

diff --git a/config/events/1654698269_merge_request_action_create.yml b/config/events/1654698269_merge_request_action_create.yml
new file mode 100644
index 00000000000..999d9744c92
--- /dev/null
+++ b/config/events/1654698269_merge_request_action_create.yml
@@ -0,0 +1,26 @@
+---
+description: Triggered from backend layer when merge request is created
+category: merge_request_action
+action: create
+label_description: Constant string that match with ServicePing metric name of merge_requests_users
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89544
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/1654698359_merge_request_action_close.yml b/config/events/1654698359_merge_request_action_close.yml
new file mode 100644
index 00000000000..79807fa378d
--- /dev/null
+++ b/config/events/1654698359_merge_request_action_close.yml
@@ -0,0 +1,26 @@
+---
+description: Triggered from backend layer when merge request is closed
+category: merge_request_action
+action: close
+label_description: Constant string that match with ServicePing metric name of merge_requests_users
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89544
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/1654698407_merge_request_action_merge.yml b/config/events/1654698407_merge_request_action_merge.yml
new file mode 100644
index 00000000000..3a0a1282e93
--- /dev/null
+++ b/config/events/1654698407_merge_request_action_merge.yml
@@ -0,0 +1,26 @@
+---
+description: Triggered from backend layer when merge request is merged
+category: merge_request_action
+action: merge
+label_description: Constant string that match with ServicePing metric name of merge_requests_users
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89544
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/1654843786_merge_request_action_comment.yml b/config/events/1654843786_merge_request_action_comment.yml
new file mode 100644
index 00000000000..5cd384cd78e
--- /dev/null
+++ b/config/events/1654843786_merge_request_action_comment.yml
@@ -0,0 +1,27 @@
+---
+description: Triggered from backend layer when merge request is commented
+category: merge_request_action
+action: comment
+label_description: Constant string that match with ServicePing metric name of merge_requests_users
+property_description:
+value_description:
+extra_properties:
+identifiers:
+  - project
+  - user
+  - namespace
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+milestone: "15.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89544
+distributions:
+  - ce
+  - ee
+tiers:
+  - free
+  - premium
+  - ultimate
+
+