From 02b76fefbc630dce5b46ba49191c2654b5e50166 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Jul 2020 00:09:34 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/notes/create_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/services/notes') diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 935dbfb72dd..5a9f0b7fa68 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -66,7 +66,7 @@ module Notes Gitlab::Tracking.event('Notes::CreateService', 'execute', tracking_data_for(note)) end - if Feature.enabled?(:merge_ref_head_comments, project) && note.for_merge_request? && note.diff_note? && note.start_of_discussion? + if Feature.enabled?(:merge_ref_head_comments, project, default_enabled: true) && note.for_merge_request? && note.diff_note? && note.start_of_discussion? Discussions::CaptureDiffNotePositionService.new(note.noteable, note.diff_file&.paths).execute(note.discussion) end end -- cgit v1.2.1