Commit d5aa36f1 authored by Winnie Hellmann's avatar Winnie Hellmann

Enable reply_to_individual_notes feature flag by default

parent c9e5ce8d
...@@ -8,7 +8,7 @@ module IssuableActions ...@@ -8,7 +8,7 @@ module IssuableActions
before_action :authorize_destroy_issuable!, only: :destroy before_action :authorize_destroy_issuable!, only: :destroy
before_action :authorize_admin_issuable!, only: :bulk_update before_action :authorize_admin_issuable!, only: :bulk_update
before_action only: :show do 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
end end
......
...@@ -14,7 +14,7 @@ class IndividualNoteDiscussion < Discussion ...@@ -14,7 +14,7 @@ class IndividualNoteDiscussion < Discussion
end end
def can_convert_to_discussion? 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 end
def convert_to_discussion!(save: false) def convert_to_discussion!(save: false)
......
---
title: Add button to start discussion from single comment
merge_request: 25575
author:
type: added
...@@ -67,7 +67,7 @@ describe 'Merge request > User posts notes', :js do ...@@ -67,7 +67,7 @@ describe 'Merge request > User posts notes', :js do
end end
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 before do
stub_feature_flags(reply_to_individual_notes: false) stub_feature_flags(reply_to_individual_notes: false)
visit project_merge_request_path(project, merge_request) visit project_merge_request_path(project, merge_request)
...@@ -78,9 +78,8 @@ describe 'Merge request > User posts notes', :js do ...@@ -78,9 +78,8 @@ describe 'Merge request > User posts notes', :js do
end end
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 before do
stub_feature_flags(reply_to_individual_notes: true)
visit project_merge_request_path(project, merge_request) visit project_merge_request_path(project, merge_request)
end end
......
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