Enable reply_to_individual_notes feature flag by default

4 files changed, 9 insertions, 5 deletions

diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb
index cd3fa641e89..05d88429cfe 100644
--- a/app/controllers/concerns/issuable_actions.rb
+++ b/app/controllers/concerns/issuable_actions.rb
@@ -8,7 +8,7 @@ module IssuableActions
     before_action :authorize_destroy_issuable!, only: :destroy
     before_action :authorize_admin_issuable!, only: :bulk_update
     before_action only: :show do
-      push_frontend_feature_flag(:reply_to_individual_notes)
+      push_frontend_feature_flag(:reply_to_individual_notes, default_enabled: true)
     end
   end
 
diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb
index b4a661ae5b4..3b6b68a9c5f 100644
--- a/app/models/individual_note_discussion.rb
+++ b/app/models/individual_note_discussion.rb
@@ -14,7 +14,7 @@ class IndividualNoteDiscussion < Discussion
   end
 
   def can_convert_to_discussion?
-    noteable.supports_replying_to_individual_notes? && Feature.enabled?(:reply_to_individual_notes)
+    noteable.supports_replying_to_individual_notes? && Feature.enabled?(:reply_to_individual_notes, default_enabled: true)
   end
 
   def convert_to_discussion!(save: false)
diff --git a/changelogs/unreleased/winh-enable-reply_to_individual_notes.yml b/changelogs/unreleased/winh-enable-reply_to_individual_notes.yml
new file mode 100644
index 00000000000..a9c280320dc
--- /dev/null
+++ b/changelogs/unreleased/winh-enable-reply_to_individual_notes.yml
@@ -0,0 +1,5 @@
+---
+title: Add button to start discussion from single comment
+merge_request: 25575
+author:
+type: added
diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb
index 1bbcf455ac7..dc0862be6fc 100644
--- a/spec/features/merge_request/user_posts_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_notes_spec.rb
@@ -67,7 +67,7 @@ describe 'Merge request > User posts notes', :js do
       end
     end
 
-    describe 'when reply_to_individual_notes feature flag is not set' do
+    describe 'when reply_to_individual_notes feature flag is disabled' do
       before do
         stub_feature_flags(reply_to_individual_notes: false)
         visit project_merge_request_path(project, merge_request)
@@ -78,9 +78,8 @@ describe 'Merge request > User posts notes', :js do
       end
     end
 
-    describe 'when reply_to_individual_notes feature flag is set' do
+    describe 'when reply_to_individual_notes feature flag is not set' do
       before do
-        stub_feature_flags(reply_to_individual_notes: true)
         visit project_merge_request_path(project, merge_request)
       end