Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1b99c5a5
Commit
1b99c5a5
authored
Jul 07, 2020
by
Sean Arnold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove generic_alert_fingerprinting FF
- Keep license check and adjust specs
parent
7784c290
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
12 deletions
+3
-12
ee/lib/ee/gitlab/alerting/notification_payload_parser.rb
ee/lib/ee/gitlab/alerting/notification_payload_parser.rb
+1
-2
ee/spec/lib/ee/gitlab/alerting/notification_payload_parser_spec.rb
...ib/ee/gitlab/alerting/notification_payload_parser_spec.rb
+0
-8
ee/spec/services/projects/alerting/notify_service_spec.rb
ee/spec/services/projects/alerting/notify_service_spec.rb
+2
-2
No files found.
ee/lib/ee/gitlab/alerting/notification_payload_parser.rb
View file @
1b99c5a5
...
...
@@ -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
...
...
ee/spec/lib/ee/gitlab/alerting/notification_payload_parser_spec.rb
View file @
1b99c5a5
...
...
@@ -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
{
...
...
ee/spec/services/projects/alerting/notify_service_spec.rb
View file @
1b99c5a5
...
...
@@ -29,7 +29,7 @@ RSpec.describe Projects::Alerting::NotifyService do
existing_alert
# create existing alert
end
context
'generic fingerprinting
featur
e not enabled'
do
context
'generic fingerprinting
licens
e 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
featur
e enabled'
do
context
'generic fingerprinting
licens
e enabled'
do
let
(
:fingerprinting_enabled
)
{
true
}
it
'does not create AlertManagement::Alert'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment