Add latest changes from gitlab-org/gitlab@master

4 files changed, 26 insertions, 10 deletions

diff --git a/config/feature_flags/development/usage_data_track_ecosystem_slack_service.yml b/config/feature_flags/development/cached_encoding_detection.yml
index d9d4c06c9fa..362c465cfb6 100644
--- a/config/feature_flags/development/usage_data_track_ecosystem_slack_service.yml
+++ b/config/feature_flags/development/cached_encoding_detection.yml
@@ -1,8 +1,8 @@
 ---
-name: usage_data_track_ecosystem_slack_service
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322588
-milestone: '13.10'
+name: cached_encoding_detection
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60128
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328819
+milestone: '13.12'
 type: development
-group: group::ecosystem
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/find_remote_root_refs_inmemory.yml b/config/feature_flags/development/find_remote_root_refs_inmemory.yml
new file mode 100644
index 00000000000..18e2e2b366a
--- /dev/null
+++ b/config/feature_flags/development/find_remote_root_refs_inmemory.yml
@@ -0,0 +1,8 @@
+---
+name: find_remote_root_refs_inmemory
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60583
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329664
+milestone: '13.12'
+type: development
+group: group::gitaly
+default_enabled: true
diff --git a/config/feature_flags/development/limited_diff_highlighting.yml b/config/feature_flags/development/limited_diff_highlighting.yml
new file mode 100644
index 00000000000..1cfd9927c7a
--- /dev/null
+++ b/config/feature_flags/development/limited_diff_highlighting.yml
@@ -0,0 +1,8 @@
+---
+name: limited_diff_highlighting
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53768
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323566
+milestone: '13.12'
+type: development
+group: group::source code
+default_enabled: true
diff --git a/config/feature_flags/development/ci_no_empty_groups.yml b/config/feature_flags/development/track_highlight_timeouts.yml
index ef7d6459a5a..a85749e5187 100644
--- a/config/feature_flags/development/ci_no_empty_groups.yml
+++ b/config/feature_flags/development/track_highlight_timeouts.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_no_empty_groups
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58789
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327139
-milestone: '13.11'
+name: track_highlight_timeouts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60956
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329909
+milestone: '13.12'
 type: development
-group: group::verify
+group: group::code review
 default_enabled: false