Skip to content
Snippets Groups Projects
Commit 04d4ef4d authored by Alex Kalderimis's avatar Alex Kalderimis :large_blue_circle:
Browse files

Remove the webhooks_failed_callout feature-flag

See: #365535

Changelog: changed
parent fdb41919
No related branches found
No related tags found
No related merge requests found
......@@ -7,7 +7,6 @@ module WebHooksHelper
def show_project_hook_failed_callout?(project:)
return false if project_hook_page?
return false unless current_user
return false unless Feature.enabled?(:webhooks_failed_callout, project)
return false unless Feature.enabled?(:web_hooks_disable_failed, project)
return false unless Ability.allowed?(current_user, :read_web_hooks, project)
......
---
name: webhooks_failed_callout
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91092
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365535
milestone: '15.2'
type: development
group: group::integrations
default_enabled: false
......@@ -8,14 +8,12 @@
let(:current_user) { nil }
let(:callout_dismissed) { false }
let(:web_hooks_disable_failed) { false }
let(:webhooks_failed_callout) { false }
before do
allow(helper).to receive(:current_user).and_return(current_user)
allow(helper).to receive(:web_hook_disabled_dismissed?).with(project).and_return(callout_dismissed)
stub_feature_flags(
webhooks_failed_callout: webhooks_failed_callout,
web_hooks_disable_failed: web_hooks_disable_failed
)
end
......@@ -24,14 +22,6 @@
let(:current_user) { create(:user) }
end
shared_context 'webhooks_failed_callout is enabled' do
let(:webhooks_failed_callout) { true }
end
shared_context 'webhooks_failed_callout is enabled for this project' do
let(:webhooks_failed_callout) { project }
end
shared_context 'web_hooks_disable_failed is enabled' do
let(:web_hooks_disable_failed) { true }
end
......@@ -59,7 +49,6 @@
describe '#show_project_hook_failed_callout?' do
context 'all conditions are met' do
include_context 'user is logged in'
include_context 'webhooks_failed_callout is enabled'
include_context 'web_hooks_disable_failed is enabled'
include_context 'the user has permission'
include_context 'a hook has failed'
......@@ -87,7 +76,6 @@
context 'all conditions are met, project scoped flags' do
include_context 'user is logged in'
include_context 'webhooks_failed_callout is enabled for this project'
include_context 'web_hooks_disable_failed is enabled for this project'
include_context 'the user has permission'
include_context 'a hook has failed'
......@@ -100,7 +88,6 @@
context 'one condition is not met' do
contexts = [
'user is logged in',
'webhooks_failed_callout is enabled',
'web_hooks_disable_failed is enabled',
'the user has permission',
'a hook has failed'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment