diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index a63b1cf375fe95f3fac8026c3394410ed5025384..0ccb25c23350910ea70f9938b1a9400294a758ff 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -212,7 +212,7 @@ def track_note_creation_usage_for_merge_requests(note) end def should_track_ipynb_notes?(note) - Feature.enabled?(:ipynbdiff_notes_tracker) && note.respond_to?(:diff_file) && note.diff_file&.ipynb? + note.respond_to?(:diff_file) && note.diff_file&.ipynb? end def track_note_creation_in_ipynb(note) diff --git a/config/feature_flags/development/ipynbdiff_notes_tracker.yml b/config/feature_flags/development/ipynbdiff_notes_tracker.yml deleted file mode 100644 index af471a3f6ee08b978691c13ad92cefadfeb9057a..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/ipynbdiff_notes_tracker.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ipynbdiff_notes_tracker -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85398 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362232 -milestone: '15.0' -type: development -group: group::incubation -default_enabled: false diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb index c1b15ec7681d702a321fe86043fa0703c4af5e95..a46a1438d1864757b3446184d7bc60152a71b62d 100644 --- a/spec/services/notes/create_service_spec.rb +++ b/spec/services/notes/create_service_spec.rb @@ -395,27 +395,12 @@ context 'is ipynb file' do before do allow_any_instance_of(::Gitlab::Diff::File).to receive(:ipynb?).and_return(true) - stub_feature_flags(ipynbdiff_notes_tracker: false) end - context ':ipynbdiff_notes_tracker is off' do - it 'does not track ipynb note usage data' do - expect(::Gitlab::UsageDataCounters::IpynbDiffActivityCounter).not_to receive(:note_created) + it 'tracks ipynb diff note creation' do + expect(::Gitlab::UsageDataCounters::IpynbDiffActivityCounter).to receive(:note_created) - described_class.new(project_with_repo, user, new_opts).execute - end - end - - context ':ipynbdiff_notes_tracker is on' do - before do - stub_feature_flags(ipynbdiff_notes_tracker: true) - end - - it 'tracks ipynb diff note creation' do - expect(::Gitlab::UsageDataCounters::IpynbDiffActivityCounter).to receive(:note_created) - - described_class.new(project_with_repo, user, new_opts).execute - end + described_class.new(project_with_repo, user, new_opts).execute end end end