From 3dad1b39c765d4557dbc7e594b98472110bf8be2 Mon Sep 17 00:00:00 2001
From: Eduardo Bonet <ebonet@gitlab.com>
Date: Tue, 14 Nov 2023 08:23:56 -0300
Subject: [PATCH] Removes feature flag ipynbdiff_notes_tracker
Feature has been active for many milestones, no need to keep this live.
Changelog: other
---
app/services/notes/create_service.rb | 2 +-
.../development/ipynbdiff_notes_tracker.yml | 8 -------
spec/services/notes/create_service_spec.rb | 21 +++----------------
3 files changed, 4 insertions(+), 27 deletions(-)
delete mode 100644 config/feature_flags/development/ipynbdiff_notes_tracker.yml
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index a63b1cf375fe9..0ccb25c233509 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 af471a3f6ee08..0000000000000
--- 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 c1b15ec7681d7..a46a1438d1864 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
--
GitLab