Commit 7f13e0bc authored by James Fargher's avatar James Fargher

Merge branch '224113-remove-ff-for-generic-alert-fingerprinting' into 'master'

FF Removal: generic_alert_fingerprinting

Closes #224113

See merge request gitlab-org/gitlab!36148
parents 943b6b38 c2865d8c
---
title: Remove generic_alert_fingerprinting feature flag
merge_request: 36148
author:
type: added
......@@ -26,8 +26,7 @@ module EE
private
def generic_alert_fingerprinting_enabled?
project.feature_available?(:generic_alert_fingerprinting) &&
project.beta_feature_available?(:generic_alert_fingerprinting)
project.feature_available?(:generic_alert_fingerprinting)
end
end
end
......
......@@ -35,14 +35,6 @@ RSpec.describe Gitlab::Alerting::NotificationPayloadParser do
expect(fingerprint).to eq(expected_fingerprint)
end
context 'feature not enabled' do
before do
stub_feature_flags(generic_alert_fingerprinting: false)
end
it { is_expected.to eq(nil) }
end
context 'payload has no values' do
let(:payload) do
{
......
......@@ -29,7 +29,7 @@ RSpec.describe Projects::Alerting::NotifyService do
existing_alert # create existing alert
end
context 'generic fingerprinting feature not enabled' do
context 'generic fingerprinting license not enabled' do
let(:fingerprinting_enabled) { false }
it 'creates AlertManagement::Alert' do
......@@ -41,7 +41,7 @@ RSpec.describe Projects::Alerting::NotifyService do
end
end
context 'generic fingerprinting feature enabled' do
context 'generic fingerprinting license enabled' do
let(:fingerprinting_enabled) { true }
it 'does not create AlertManagement::Alert' do
......
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