diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-24 00:09:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-24 00:09:34 +0000 |
| commit | 02b76fefbc630dce5b46ba49191c2654b5e50166 (patch) | |
| tree | 3c530ad688c08fa42028f60e30d6eedf26cb066f /app/services/notes | |
| parent | f11dc1407036de71ef66afa21d1f7acef59d6c95 (diff) | |
| download | gitlab-ce-02b76fefbc630dce5b46ba49191c2654b5e50166.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/notes')
| -rw-r--r-- | app/services/notes/create_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |