Commit c908a2fd authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'ph/351273/fixDiffUsageDataFeatureFlag' into 'master'

Renamed diff searching feature flag

See merge request gitlab-org/gitlab!79513
parents 212b952b a57e0c60
...@@ -524,7 +524,7 @@ export default { ...@@ -524,7 +524,7 @@ export default {
if ( if (
window.gon?.features?.diffsVirtualScrolling || window.gon?.features?.diffsVirtualScrolling ||
window.gon?.features?.diffSearchingUsageData window.gon?.features?.usageDataDiffSearches
) { ) {
let keydownTime; let keydownTime;
Mousetrap.bind(['mod+f', 'mod+g'], () => { Mousetrap.bind(['mod+f', 'mod+g'], () => {
...@@ -540,7 +540,7 @@ export default { ...@@ -540,7 +540,7 @@ export default {
if (delta >= 0 && delta < 1000) { if (delta >= 0 && delta < 1000) {
this.disableVirtualScroller(); this.disableVirtualScroller();
if (window.gon?.features?.diffSearchingUsageData) { if (window.gon?.features?.usageDataDiffSearches) {
api.trackRedisHllUserEvent('i_code_review_user_searches_diff'); api.trackRedisHllUserEvent('i_code_review_user_searches_diff');
api.trackRedisCounterEvent('diff_searches'); api.trackRedisCounterEvent('diff_searches');
} }
......
...@@ -47,7 +47,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -47,7 +47,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
# Usage data feature flags # Usage data feature flags
push_frontend_feature_flag(:users_expanding_widgets_usage_data, @project, default_enabled: :yaml) push_frontend_feature_flag(:users_expanding_widgets_usage_data, @project, default_enabled: :yaml)
push_frontend_feature_flag(:diff_settings_usage_data, default_enabled: :yaml) push_frontend_feature_flag(:diff_settings_usage_data, default_enabled: :yaml)
push_frontend_feature_flag(:diff_searching_usage_data, @project, default_enabled: :yaml) push_frontend_feature_flag(:usage_data_diff_searches, @project, default_enabled: :yaml)
end end
around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions] around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
......
--- ---
name: diff_searching_usage_data name: usage_data_diff_searches
introduced_by_url: introduced_by_url:
rollout_issue_url: rollout_issue_url:
milestone: '14.2' milestone: '14.2'
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
redis_slot: code_review redis_slot: code_review
category: code_review category: code_review
aggregation: weekly aggregation: weekly
feature_flag: diff_searching_usage_data feature_flag: usage_data_diff_searches
- name: i_code_review_total_suggestions_applied - name: i_code_review_total_suggestions_applied
redis_slot: code_review redis_slot: code_review
category: code_review category: code_review
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment