Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-16 09:09:07 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-16 09:09:07 +0300
commit1de9854406851f7f1b599dd3311189f16db422f3 (patch)
tree0aeab92a66afb1519c737d191b60222e2f1fac9d /lib
parent4a6e201d83ef80d9ad0ebabc5e5bfdec6726dfda (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/usage_data_counters/known_events/code_review_events.yml5
-rw-r--r--lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb5
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
index af1016c3c0f..d657c5487d7 100644
--- a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
@@ -159,3 +159,8 @@
category: code_review
aggregation: weekly
feature_flag: usage_data_i_code_review_user_vs_code_api_request
+- name: i_code_review_user_create_mr_from_issue
+ redis_slot: code_review
+ category: code_review
+ aggregation: weekly
+ feature_flag: usage_data_i_code_review_user_create_mr_from_issue
diff --git a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
index 1afe99151ac..b9856e1f74a 100644
--- a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
@@ -34,6 +34,7 @@ module Gitlab
MR_APPROVAL_RULE_DELETED_USERS_ACTION = 'i_code_review_user_approval_rule_deleted'
MR_EDIT_MR_TITLE_ACTION = 'i_code_review_edit_mr_title'
MR_EDIT_MR_DESC_ACTION = 'i_code_review_edit_mr_desc'
+ MR_CREATE_FROM_ISSUE_ACTION = 'i_code_review_user_create_mr_from_issue'
class << self
def track_mr_diffs_action(merge_request:)
@@ -148,6 +149,10 @@ module Gitlab
track_unique_action_by_user(MR_TASK_ITEM_STATUS_CHANGED_ACTION, user)
end
+ def track_mr_create_from_issue(user:)
+ track_unique_action_by_user(MR_CREATE_FROM_ISSUE_ACTION, user)
+ end
+
private
def track_unique_action_by_merge_request(action, merge_request)