Add latest changes from gitlab-org/gitlab@master

7 files changed, 21 insertions, 5 deletions

diff --git a/config/feature_flags/development/batch_suggestions.yml b/config/feature_flags/development/batch_suggestions.yml
index b6180a6990b..6a13094f0ab 100644
--- a/config/feature_flags/development/batch_suggestions.yml
+++ b/config/feature_flags/development/batch_suggestions.yml
@@ -1,7 +1,7 @@
 ---
 name: batch_suggestions
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34782
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320755
 milestone: '13.1'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/context_commits.yml b/config/feature_flags/development/context_commits.yml
index bd71cf49da2..521ab5d0a6f 100644
--- a/config/feature_flags/development/context_commits.yml
+++ b/config/feature_flags/development/context_commits.yml
@@ -1,7 +1,7 @@
 ---
 name: context_commits
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23701
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320757
 milestone: '12.8'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/merge_request_draft_filter.yml b/config/feature_flags/development/merge_request_draft_filter.yml
index 0614485d37c..3c08e0304d2 100644
--- a/config/feature_flags/development/merge_request_draft_filter.yml
+++ b/config/feature_flags/development/merge_request_draft_filter.yml
@@ -1,7 +1,7 @@
 ---
 name: merge_request_draft_filter
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35942
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/298776
 milestone: '13.3'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/merge_request_rebase_nowait_lock.yml b/config/feature_flags/development/merge_request_rebase_nowait_lock.yml
index 73b8fe9ab63..e0d837a3757 100644
--- a/config/feature_flags/development/merge_request_rebase_nowait_lock.yml
+++ b/config/feature_flags/development/merge_request_rebase_nowait_lock.yml
@@ -1,7 +1,7 @@
 ---
 name: merge_request_rebase_nowait_lock
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18481
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320758
 milestone: '12.5'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/remove_resolve_note.yml b/config/feature_flags/development/remove_resolve_note.yml
index 0f792dffd0b..008a469e16d 100644
--- a/config/feature_flags/development/remove_resolve_note.yml
+++ b/config/feature_flags/development/remove_resolve_note.yml
@@ -1,7 +1,7 @@
 ---
 name: remove_resolve_note
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45549
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320756
 milestone: '13.6'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_approve_mr.yml b/config/feature_flags/development/usage_data_i_code_review_user_approve_mr.yml
new file mode 100644
index 00000000000..c20d201de7c
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_approve_mr.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_approve_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53201
+rollout_issue_url:
+milestone: '13.9'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_unapprove_mr.yml b/config/feature_flags/development/usage_data_i_code_review_user_unapprove_mr.yml
new file mode 100644
index 00000000000..9d31ad6a482
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_unapprove_mr.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_unapprove_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53201
+rollout_issue_url:
+milestone: '13.9'
+type: development
+group: group::code review
+default_enabled: true