Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 98668c72ff4..872156039c0 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -51,15 +51,15 @@ module Gitlab
 
       # Initialize gon.features with any flags that should be
       # made globally available to the frontend
-      push_frontend_feature_flag(:usage_data_api, type: :ops, default_enabled: :yaml)
-      push_frontend_feature_flag(:security_auto_fix, default_enabled: false)
-      push_frontend_feature_flag(:new_header_search, default_enabled: :yaml)
-      push_frontend_feature_flag(:bootstrap_confirmation_modals, default_enabled: :yaml)
-      push_frontend_feature_flag(:sandboxed_mermaid, default_enabled: :yaml)
-      push_frontend_feature_flag(:source_editor_toolbar, default_enabled: :yaml)
-      push_frontend_feature_flag(:gl_avatar_for_all_user_avatars, default_enabled: :yaml)
-      push_frontend_feature_flag(:mr_attention_requests, current_user, default_enabled: :yaml)
-      push_frontend_feature_flag(:follow_in_user_popover, current_user, default_enabled: :yaml)
+      push_frontend_feature_flag(:usage_data_api, type: :ops)
+      push_frontend_feature_flag(:security_auto_fix)
+      push_frontend_feature_flag(:new_header_search)
+      push_frontend_feature_flag(:bootstrap_confirmation_modals)
+      push_frontend_feature_flag(:sandboxed_mermaid)
+      push_frontend_feature_flag(:source_editor_toolbar)
+      push_frontend_feature_flag(:gl_avatar_for_all_user_avatars)
+      push_frontend_feature_flag(:mr_attention_requests, current_user)
+      push_frontend_feature_flag(:follow_in_user_popover, current_user)
     end
 
     # Exposes the state of a feature flag to the frontend code.